Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1,040 changes: 671 additions & 369 deletions Cargo.lock

Large diffs are not rendered by default.

18 changes: 9 additions & 9 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,33 +3,33 @@ members = ["crates/gitbutler-*", "crates/but-*"]
resolver = "2"

[workspace.dependencies]
bstr = "1.11.1"
bstr = "1.11.3"
# Add the `tracing` or `tracing-detail` features to see more of gitoxide in the logs. Useful to see which programs it invokes.
gix = { git = "https://github.com/GitoxideLabs/gitoxide", rev = "cd96b6439d119c5189a8e7349d2e7e2533db41b5", default-features = false, features = [
] }
gix-testtools = "0.15.0"
insta = "1.41.1"
git2 = { version = "0.20.0", features = [
insta = "1.42.2"
git2 = { version = "0.20.1", features = [
"vendored-openssl",
"vendored-libgit2",
] }
uuid = { version = "1.11.0", features = ["v4", "serde"] }
uuid = { version = "1.16.0", features = ["v4", "serde"] }
serde = { version = "1.0", features = ["derive"] }
thiserror = "2.0.9"
tokio = { version = "1.42.0", default-features = false }
keyring = { version = "3.6.1", features = [
thiserror = "2.0.12"
tokio = { version = "1.44.1", default-features = false }
keyring = { version = "3.6.2", features = [
"apple-native",
"windows-native",
"linux-native",
"crypto-rust",
] }
anyhow = "1.0.95"
anyhow = "1.0.97"
parking_lot = "0.12.3"
futures = "0.3.31"
toml = "0.8.13"
tracing = "0.1.41"
tracing-subscriber = "0.3.19"
tempfile = "3.14"
tempfile = "3.19"
rand = "0.9.0"

gitbutler-id = { path = "crates/gitbutler-id" }
Expand Down
2 changes: 1 addition & 1 deletion crates/but-cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ but-hunk-dependency.workspace = true

gitbutler-commit = { workspace = true, optional = true, features = ["testing"] }

clap = { version = "4.5.23", features = ["derive", "env"] }
clap = { version = "4.5.35", features = ["derive", "env"] }
gix.workspace = true
anyhow.workspace = true
itertools = "0.14.0"
Expand Down
2 changes: 1 addition & 1 deletion crates/but-core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ testing = []
serde = { workspace = true, features = ["std"] }
bstr.workspace = true
tracing.workspace = true
anyhow = "1.0.95"
anyhow = "1.0.97"
gix = { workspace = true, features = ["dirwalk", "credentials", "parallel", "serde", "status"] }
gitbutler-serde.workspace = true
gitbutler-error.workspace = true
Expand Down
6 changes: 3 additions & 3 deletions crates/but-hunk-dependency/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ publish = false
doctest = false

[dependencies]
anyhow = "1.0.95"
anyhow = "1.0.97"
itertools = "0.14.0"
serde.workspace = true
gix = { workspace = true, features = [] }
Expand All @@ -23,7 +23,7 @@ gitbutler-repo.workspace = true
gitbutler-oxidize.workspace = true

# For `ui` module
rustc-hash = "2.1.0"
rustc-hash = "2.1.1"
gitbutler-stack.workspace = true

[dev-dependencies]
Expand All @@ -32,4 +32,4 @@ gitbutler-testsupport.workspace = true
gitbutler-oxidize.workspace = true
itertools = "0.14.0"
insta.workspace = true
serde_json = "1.0.138"
serde_json = "1.0.140"
4 changes: 2 additions & 2 deletions crates/but-rebase/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ gitbutler-oxidize.workspace = true
gitbutler-error.workspace = true
bstr.workspace = true
tempfile.workspace = true
serde = { version = "1.0.217", features = ["derive"] }
serde = { version = "1.0.219", features = ["derive"] }
toml.workspace = true

[dev-dependencies]
but-testsupport.workspace = true
insta = "1.42.1"
insta = "1.42.2"
but-core = { workspace = true, features = ["testing"] }
2 changes: 1 addition & 1 deletion crates/but-settings/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ authors = ["GitButler <gitbutler@gitbutler.com>"]
publish = false

[dependencies]
anyhow = "1.0.95"
anyhow = "1.0.97"
serde = { workspace = true, features = ["std"] }
serde_json = { version = "1.0", features = ["std", "arbitrary_precision"] }
serde_json_lenient = "0.2.3"
Expand Down
2 changes: 1 addition & 1 deletion crates/but-workspace/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ tracing.workspace = true
[dev-dependencies]
rustix = { version = "1.0.2", features = ["process", "fs"] }
but-testsupport.workspace = true
insta = "1.42.1"
insta = "1.42.2"
but-core = { workspace = true, features = ["testing"] }
# for stable hashes in `gitbuter-` crates while we use them.
# TODO: remove once `gitbutler-repo` isn't needed anymore.
Expand Down
2 changes: 1 addition & 1 deletion crates/gitbutler-branch-actions/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ publish = false

[dependencies]
tracing.workspace = true
anyhow = "1.0.95"
anyhow = "1.0.97"
git2.workspace = true
gix = { workspace = true, features = ["blob-diff", "revision", "merge"] }
tokio.workspace = true
Expand Down
2 changes: 1 addition & 1 deletion crates/gitbutler-branch/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ publish = false
autotests = false

[dependencies]
anyhow = "1.0.95"
anyhow = "1.0.97"
git2.workspace = true
gix = { workspace = true, features = [] }
gitbutler-reference.workspace = true
Expand Down
6 changes: 3 additions & 3 deletions crates/gitbutler-cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ gitbutler-stack.workspace = true
gitbutler-oxidize.workspace = true
gix = { workspace = true, features = ["max-performance", "tracing"] }
dirs-next = "2.0.0"
clap = { version = "4.5.23", features = ["derive", "env"] }
anyhow = "1.0.95"
chrono = "0.4.39"
clap = { version = "4.5.35", features = ["derive", "env"] }
anyhow = "1.0.97"
chrono = "0.4.40"
tracing-forest = { version = "0.1.6" }
tracing-subscriber.workspace = true
tracing.workspace = true
Expand Down
4 changes: 2 additions & 2 deletions crates/gitbutler-command-context/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ authors = ["GitButler <gitbutler@gitbutler.com>"]
publish = false

[dependencies]
anyhow = "1.0.95"
anyhow = "1.0.97"
git2.workspace = true
gix.workspace = true
tracing.workspace = true
gitbutler-project.workspace = true
but-settings.workspace = true
bstr = "1.11.1"
bstr = "1.11.3"
2 changes: 1 addition & 1 deletion crates/gitbutler-config/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ publish = false
[dependencies]
git2.workspace = true
gix.workspace = true
anyhow = "1.0.95"
anyhow = "1.0.97"
tracing.workspace = true
serde = { workspace = true, features = ["std"]}
gitbutler-project.workspace = true
4 changes: 2 additions & 2 deletions crates/gitbutler-diff/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@ autotests = false
git2.workspace = true
bstr.workspace = true
md5 = "0.7.0"
anyhow = "1.0.95"
anyhow = "1.0.97"
hex = "0.4.3"
tracing.workspace = true
gitbutler-serde.workspace = true
gitbutler-command-context.workspace = true
gitbutler-cherry-pick.workspace = true
diffy = "0.4.0"
diffy = "0.4.2"
serde = { workspace = true, features = ["std"] }

[[test]]
Expand Down
2 changes: 1 addition & 1 deletion crates/gitbutler-error/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ authors = ["GitButler <gitbutler@gitbutler.com>"]
publish = false

[dependencies]
anyhow = "1.0.95"
anyhow = "1.0.97"
4 changes: 2 additions & 2 deletions crates/gitbutler-feedback/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ authors = ["GitButler <gitbutler@gitbutler.com>"]
publish = false

[dependencies]
anyhow = "1.0.95"
zip = "2.2.0"
anyhow = "1.0.97"
zip = "2.6.1"
walkdir = "2.5.0"
sha2 = "0.10.8"
gitbutler-project.workspace = true
Expand Down
2 changes: 1 addition & 1 deletion crates/gitbutler-forge/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ publish = false

[dependencies]
serde = { workspace = true, features = ["std"] }
anyhow = "1.0.86"
anyhow = "1.0.97"
gitbutler-fs.workspace = true
2 changes: 1 addition & 1 deletion crates/gitbutler-fs/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ publish = false
[dependencies]
serde = { workspace = true, features = ["std"] }
bstr.workspace = true
anyhow = "1.0.95"
anyhow = "1.0.97"
gix = { workspace = true, features = ["dirwalk", "credentials", "parallel"] }
walkdir = "2.5.0"
toml.workspace = true
6 changes: 3 additions & 3 deletions crates/gitbutler-git/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -40,14 +40,14 @@ tokio = { workspace = true, optional = true, features = [
uuid = { workspace = true, features = ["fast-rng"] }
rand.workspace = true
futures.workspace = true
sysinfo = "0.33.1"
gix-path = "0.10.11"
sysinfo = "0.34.2"
gix-path = "0.10.15"

[target."cfg(unix)".dependencies]
nix = { version = "0.29.0", features = ["process", "socket", "user"] }

[target."cfg(windows)".dependencies]
windows = { version = "0.58.0", features = [
windows = { version = "0.61.1", features = [
"Win32",
"Win32_System",
"Win32_System_Pipes",
Expand Down
2 changes: 1 addition & 1 deletion crates/gitbutler-hunk-dependency/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ publish = false
autotests = false

[dependencies]
anyhow = "1.0.95"
anyhow = "1.0.97"
git2.workspace = true
gitbutler-diff.workspace = true
gitbutler-serde.workspace = true
Expand Down
4 changes: 2 additions & 2 deletions crates/gitbutler-oplog/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ publish = false
autotests = false

[dependencies]
anyhow = "1.0.95"
anyhow = "1.0.97"
git2.workspace = true
gitbutler-repo.workspace = true
serde = { workspace = true, features = ["std"] }
itertools = "0.14"
strum = { version = "0.26", features = ["derive"] }
strum = { version = "0.27", features = ["derive"] }
tracing.workspace = true
gix = { workspace = true, features = ["dirwalk", "credentials", "parallel"] }
toml.workspace = true
Expand Down
2 changes: 1 addition & 1 deletion crates/gitbutler-project/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ authors = ["GitButler <gitbutler@gitbutler.com>"]
publish = false

[dependencies]
anyhow = "1.0.95"
anyhow = "1.0.97"
parking_lot = { workspace = true, features = ["arc_lock"] }
serde = { workspace = true, features = ["std"] }
serde_json = { version = "1.0", features = ["std", "arbitrary_precision"] }
Expand Down
2 changes: 1 addition & 1 deletion crates/gitbutler-repo-actions/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ tokio = { workspace = true, features = [
"sync",
] }
log = "^0.4"
anyhow = "1.0.95"
anyhow = "1.0.97"
gitbutler-command-context.workspace = true
tracing.workspace = true
gitbutler-stack.workspace = true
Expand Down
4 changes: 2 additions & 2 deletions crates/gitbutler-repo/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ autotests = false
git2.workspace = true
git2-hooks = "0.4"
gix = { workspace = true, features = ["merge", "status", "tree-editor"] }
anyhow = "1.0.95"
anyhow = "1.0.97"
bstr.workspace = true
tracing.workspace = true
tempfile.workspace = true
Expand All @@ -33,7 +33,7 @@ uuid.workspace = true
itertools = "0.14"
toml.workspace = true
base64 = "0.22.1"
infer = "0.16.0"
infer = "0.19.0"
scopeguard = "1.2.0"

[[test]]
Expand Down
2 changes: 1 addition & 1 deletion crates/gitbutler-secret/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ publish = false
autotests = false

[dependencies]
anyhow = "1.0.95"
anyhow = "1.0.97"
tracing.workspace = true
serde = { workspace = true, features = ["std"]}
gix = { workspace = true, features = ["dirwalk", "credentials", "parallel"] }
Expand Down
4 changes: 2 additions & 2 deletions crates/gitbutler-stack/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ autotests = false
[dependencies]
git2.workspace = true
gix = { workspace = true, features = [] }
gix-utils = "0.1.12"
gix-utils = "0.2.0"
itertools = "0.14"
anyhow = "1.0.95"
anyhow = "1.0.97"
serde = { workspace = true, features = ["std"] }
toml.workspace = true
tracing.workspace = true
Expand Down
2 changes: 1 addition & 1 deletion crates/gitbutler-sync/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ authors = ["GitButler <gitbutler@gitbutler.com>"]
publish = false

[dependencies]
anyhow = "1.0.95"
anyhow = "1.0.97"
tracing.workspace = true
itertools = "0.14"
git2.workspace = true
Expand Down
20 changes: 10 additions & 10 deletions crates/gitbutler-tauri/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ test = false
tauri-build = { version = "2.0.3", features = [] }

[dependencies]
anyhow = "1.0.95"
anyhow = "1.0.97"
backtrace = { version = "0.3.74", optional = true }
console-subscriber = "0.4.1"
git2.workspace = true
Expand All @@ -31,17 +31,17 @@ reqwest = { version = "0.12.9", features = ["json"] }
serde.workspace = true
serde_json = { version = "1.0", features = ["std", "arbitrary_precision"] }
tauri = { version = "^2.1.1", features = ["unstable"] }
tauri-plugin-dialog = "2.2.0"
tauri-plugin-dialog = "2.2.1"
tauri-plugin-fs = "2.0.3"
tauri-plugin-http = "2.2.0"
tauri-plugin-log = "2.2.0"
tauri-plugin-os = "2.2.0"
tauri-plugin-process = "2.2.0"
tauri-plugin-http = "2.4.3"
tauri-plugin-log = "2.2.2"
tauri-plugin-os = "2.2.1"
tauri-plugin-process = "2.2.1"
tauri-plugin-shell = "2.2.1"
tauri-plugin-single-instance = "2.2.2"
tauri-plugin-single-instance = "2.2.3"
tauri-plugin-store = "2.2.0"
tauri-plugin-updater = "2.3.0"
tauri-plugin-window-state = "2.2.0"
tauri-plugin-updater = "2.7.0"
tauri-plugin-window-state = "2.2.2"

parking_lot.workspace = true
log = "^0.4"
Expand Down Expand Up @@ -79,7 +79,7 @@ but-core.workspace = true
but-hunk-dependency.workspace = true
open = "5"
url = "2.5.4"
tauri-plugin-clipboard-manager = "2.2.1"
tauri-plugin-clipboard-manager = "2.2.2"

[target.'cfg(target_os = "macos")'.dependencies]
tauri-plugin-trafficlights-positioner = { git = "https://github.com/gitbutlerapp/tauri-plugin-trafficlights-positioner", branch = "v2"}
Expand Down
4 changes: 2 additions & 2 deletions crates/gitbutler-testsupport/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ doctest = false
test = false

[dependencies]
anyhow = "1.0.95"
once_cell = "1.20"
anyhow = "1.0.97"
once_cell = "1.21"
git2.workspace = true
tempfile.workspace = true
keyring.workspace = true
Expand Down
2 changes: 1 addition & 1 deletion crates/gitbutler-user/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ autotests = false
[dependencies]
gitbutler-secret.workspace = true
gitbutler-storage.workspace = true
anyhow = "1.0.95"
anyhow = "1.0.97"
serde = { workspace = true, features = ["std"] }
serde_json = { version = "1.0", features = ["std", "arbitrary_precision"] }

Expand Down
Loading
Loading