phundrak/jj-cz
1
0
Fork 0
Code Issues 8 Pull Requests Actions Packages Projects 2 Releases Wiki Activity

chore(deps): upgrade jj-lib to 0.42.0
Run checks and build archives / coverage-and-sonar (push) Successful in 7m31s
Details
Run checks and build archives / build (windows-x86_64) (push) Successful in 6m19s
Details
Run checks and build archives / build (linux-aarch64) (push) Successful in 4m45s
Details
Run checks and build archives / build (linux-x86_64) (push) Successful in 8m13s
Details

Browse Source
This commit is contained in:
Lucien Cartier-Tilet
2026-06-07 12:34:37 +02:00
parent c1c25e33ff
commit 0e6b559d00
4 changed files with 95 additions and 248 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Cargo.lock
Generated
+77 -233
View File
@@ -151,9 +151,9 @@ checksum = "3a8241f3ebb85c056b509d4327ad0358fbbba6ffb340bf388f26350aeda225b1"
[[package]]
name = "bitflags"
version = "2.11.1"
version = "2.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c4512299f36f043ab09a583e57bceb5a5aab7a73db1805848e8fef3c9e8c78b3"
checksum = "b4388bee8683e3d04af747c73422af53102d2bd24d9eadb6cbc100baef4b43f8"
[[package]]
name = "blake2"
@@ -216,9 +216,9 @@ dependencies = [
[[package]]
name = "cc"
version = "1.2.62"
version = "1.2.63"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a1dce859f0832a7d088c4f1119888ab94ef4b5d6795d1ce05afb7fe159d79f98"
checksum = "556e016178bb5662a08681bbe0f00f8e17631781a4dfc8c45e466e4b185ec27f"
dependencies = [
"find-msvc-tools",
"shlex",
@@ -243,9 +243,9 @@ dependencies = [
[[package]]
name = "chrono"
version = "0.4.44"
version = "0.4.45"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c673075a2e0e5f4a1dde27ce9dee1ea4558c7ffe648f576438a20ca1d2acc4b0"
checksum = "1aa79e62e7697b8e29b513a68abacf485adcd1fe8284a4316c5ae868e6633327"
dependencies = [
"iana-time-zone",
"js-sys",
@@ -740,30 +740,27 @@ dependencies = [
[[package]]
name = "git-conventional"
version = "0.12.9"
version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f6a949b7fcc81df22526032dcddb006e78c8575e47b0e7ba57d9960570a57bc4"
checksum = "7079e0e98895b810e042ef90b667d8d0a28c172fb3212e777b2d279ec2b29f25"
dependencies = [
"unicase",
"winnow 0.7.15",
"winnow 1.0.3",
]
[[package]]
name = "gix"
version = "0.83.0"
version = "0.84.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6ce52001b946a6249d5d0d3011df0a042ac3f8a4d013460db6476577b0b9c567"
checksum = "ae54ae0ebd1a5a3c3f8d95dd3b5ca6e63f4fed9bfd585e13801a97d7bde8f9ce"
dependencies = [
"gix-actor",
"gix-archive",
"gix-attributes",
"gix-blame",
"gix-command",
"gix-commitgraph",
"gix-config",
"gix-date",
"gix-diff",
"gix-dir",
"gix-discover",
"gix-error",
"gix-features",
@@ -775,8 +772,6 @@ dependencies = [
"gix-ignore",
"gix-index",
"gix-lock",
"gix-merge",
"gix-negotiate",
"gix-object",
"gix-odb",
"gix-pack",
@@ -789,7 +784,6 @@ dependencies = [
"gix-revwalk",
"gix-sec",
"gix-shallow",
"gix-status",
"gix-submodule",
"gix-tempfile",
"gix-trace",
@@ -798,7 +792,6 @@ dependencies = [
"gix-utils",
"gix-validate",
"gix-worktree",
"gix-worktree-state",
"gix-worktree-stream",
"nonempty",
"smallvec",
@@ -816,19 +809,6 @@ dependencies = [
"gix-error",
]
[[package]]
name = "gix-archive"
version = "0.32.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9a20ec244b733338d4cb60e5e05eac700dab7fcc689647b1d1daa9396b119342"
dependencies = [
"bstr",
"gix-date",
"gix-error",
"gix-object",
"gix-worktree-stream",
]
[[package]]
name = "gix-attributes"
version = "0.33.1"
@@ -855,26 +835,6 @@ dependencies = [
"gix-error",
]
[[package]]
name = "gix-blame"
version = "0.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "14dab9a942ab54a9661ded7397c3bf927274e7afa94494db0d75cfcbde02ca0a"
dependencies = [
"gix-commitgraph",
"gix-date",
"gix-diff",
"gix-error",
"gix-hash",
"gix-object",
"gix-revwalk",
"gix-trace",
"gix-traverse",
"gix-worktree",
"smallvec",
"thiserror",
]
[[package]]
name = "gix-chunk"
version = "0.7.2"
@@ -913,9 +873,9 @@ dependencies = [
[[package]]
name = "gix-config"
version = "0.56.0"
version = "0.57.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8c01848aebd21c67f6ba41f1de8efd46ae96df21f001954a3c9e1517e514d410"
checksum = "4f2372d4b49ca28431e7d150cab9d25edc1890f0184bd57eb0e917c7799e63de"
dependencies = [
"bstr",
"gix-config-value",
@@ -956,9 +916,9 @@ dependencies = [
[[package]]
name = "gix-diff"
version = "0.63.0"
version = "0.64.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dc08e0fa1a91ff5f24affeab052f198056645e1de004910bde7b82b50ea5982a"
checksum = "3b6d9528f32d94cef2edf39a1ac01fe5a0fc44ddbb18d9e44099936047c3302b"
dependencies = [
"bstr",
"gix-command",
@@ -975,31 +935,11 @@ dependencies = [
"thiserror",
]
[[package]]
name = "gix-dir"
version = "0.25.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "32a0fc06e9e1e430cbf0a313666976d90f822f461a6525320427aa9b8af5236c"
dependencies = [
"bstr",
"gix-discover",
"gix-fs",
"gix-ignore",
"gix-index",
"gix-object",
"gix-path",
"gix-pathspec",
"gix-trace",
"gix-utils",
"gix-worktree",
"thiserror",
]
[[package]]
name = "gix-discover"
version = "0.51.0"
version = "0.52.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "17852e6a501e688a1702b24ebe5b3761d4719455bc869fd29f38b0b859bcad34"
checksum = "77bacdd12b7879d2178a80c58c2f319995e4654e1a7a23e3181e5c8a12b824f7"
dependencies = [
"bstr",
"dunce",
@@ -1042,9 +982,9 @@ dependencies = [
[[package]]
name = "gix-filter"
version = "0.30.0"
version = "0.31.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dac917dbe9653c9b615d248db91907a365bd779750c9e1b457a9d9fdeece3a08"
checksum = "ecf74b7d16f6694ce4a3049074c41be0c7987105743674f1671807bd6dce09fa"
dependencies = [
"bstr",
"encoding_rs",
@@ -1135,9 +1075,9 @@ dependencies = [
[[package]]
name = "gix-index"
version = "0.51.0"
version = "0.52.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "54c3ef97ad08121e4327a6226bd63fed6b9e3c6b976d48bddd4356d9d41191db"
checksum = "4e6b28cc592dc753adb58302bb14a64e412ee591a3bec77aa4df87bff74fa80d"
dependencies = [
"bitflags",
"bstr",
@@ -1152,7 +1092,7 @@ dependencies = [
"gix-traverse",
"gix-utils",
"gix-validate",
"hashbrown 0.16.1",
"hashbrown 0.17.1",
"itoa",
"libc",
"memmap2",
@@ -1172,51 +1112,11 @@ dependencies = [
"thiserror",
]
[[package]]
name = "gix-merge"
version = "0.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "74bbcdcc52b70a32f0a151b024dff9d0fcf56ee48f00d9503e735af9d99ea881"
dependencies = [
"bstr",
"gix-command",
"gix-diff",
"gix-filter",
"gix-fs",
"gix-hash",
"gix-imara-diff",
"gix-index",
"gix-object",
"gix-path",
"gix-quote",
"gix-revision",
"gix-revwalk",
"gix-tempfile",
"gix-trace",
"gix-worktree",
"nonempty",
"thiserror",
]
[[package]]
name = "gix-negotiate"
version = "0.31.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "103d42bfade1b8a96ca5005933127bdad461ce588d92422b2c2daa3ff20d780c"
dependencies = [
"bitflags",
"gix-commitgraph",
"gix-date",
"gix-hash",
"gix-object",
"gix-revwalk",
]
[[package]]
name = "gix-object"
version = "0.60.0"
version = "0.61.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a38075a95d7cc5df8afd38e72c617026c1456952207a4120a7f55a3fbf93b4d7"
checksum = "d5cd857e29429c7213bdef3f5aef83f8cc124774fe8ae0d27b1607d218d6d525"
dependencies = [
"bstr",
"gix-actor",
@@ -1233,9 +1133,9 @@ dependencies = [
[[package]]
name = "gix-odb"
version = "0.80.0"
version = "0.81.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "aeeda12a9663120418735ecdc1250d06eeab0be75700e47b3402a981331716ba"
checksum = "7d004c32858b1556f2d7874405edb3c97dc78fc09beaa87d57bb077ee2858a7d"
dependencies = [
"arc-swap",
"gix-features",
@@ -1254,9 +1154,9 @@ dependencies = [
[[package]]
name = "gix-pack"
version = "0.70.0"
version = "0.71.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "daf02e6f5c8f07a069c9ea5245f40d9b14856ada4086091dc99941b49002b4fa"
checksum = "e43626f2a27d1033674ec1a196b845614231e6bbd949d5e21c133045ff56b174"
dependencies = [
"clru",
"gix-chunk",
@@ -1313,9 +1213,9 @@ dependencies = [
[[package]]
name = "gix-protocol"
version = "0.61.0"
version = "0.62.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "aa4bee82db63ec635996b96efae71cf467c155fa3f34a556184373224a26c4fd"
checksum = "51dea3acb390707ab868f1f9584f18449eb95d869deffae96768e47d303595ee"
dependencies = [
"bstr",
"gix-date",
@@ -1343,9 +1243,9 @@ dependencies = [
[[package]]
name = "gix-ref"
version = "0.63.0"
version = "0.64.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d8ba9cc15f558b274c99349b83130f5ec83459660828fde9718bbbb43a726167"
checksum = "4c04f64c37eb7e6feb73c7060f8dc6f381cc5de5d53249bfd450bc48a86b2e8b"
dependencies = [
"gix-actor",
"gix-features",
@@ -1363,9 +1263,9 @@ dependencies = [
[[package]]
name = "gix-refspec"
version = "0.41.0"
version = "0.42.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "61755b27d57edc8940a1b1593c8c61548ca8e4c02da1ed8d5bfeda9eb2a6b761"
checksum = "b216ae06ec74b5f24ad0142026a997fb0a935b7410eaf9c1616fc3f0e6c5a6d3"
dependencies = [
"bstr",
"gix-error",
@@ -1379,11 +1279,10 @@ dependencies = [
[[package]]
name = "gix-revision"
version = "0.45.0"
version = "0.46.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1fb5288fac706d3ea3e4e2ba9ec38b78743b8c02f422e18cb342299cfd6ab7e8"
checksum = "0b47c88884dd3c1a19a39da19d10211fcdea2809aadc86869b6e824a1774340f"
dependencies = [
"bitflags",
"bstr",
"gix-commitgraph",
"gix-date",
@@ -1391,15 +1290,14 @@ dependencies = [
"gix-hash",
"gix-object",
"gix-revwalk",
"gix-trace",
"nonempty",
]
[[package]]
name = "gix-revwalk"
version = "0.31.0"
version = "0.32.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "313813706b073a12ff7f9b2896bf3e6504cdac7cfbc97b1920114724705069f0"
checksum = "85f5756abffe0917827aac683b13684ed99875bc398fa1f9b8f479b0681ef9e6"
dependencies = [
"gix-commitgraph",
"gix-date",
@@ -1436,34 +1334,11 @@ dependencies = [
"thiserror",
]
[[package]]
name = "gix-status"
version = "0.30.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "68c6d2a8c521ffa205fe7e268c82e6d1378ba37cd826ca10ab6129fdc29a4b65"
dependencies = [
"bstr",
"filetime",
"gix-diff",
"gix-dir",
"gix-features",
"gix-filter",
"gix-fs",
"gix-hash",
"gix-index",
"gix-object",
"gix-path",
"gix-pathspec",
"gix-worktree",
"portable-atomic",
"thiserror",
]
[[package]]
name = "gix-submodule"
version = "0.30.0"
version = "0.31.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9fd5fc8692890bd71a596e540fd4c364f8460eaa82c4eaaedebde6e1e3eb4d91"
checksum = "3059890ef054066c22a94bfc6a3eaba0d806aedcd630a0bc9e5783fd88884781"
dependencies = [
"bstr",
"gix-config",
@@ -1511,9 +1386,9 @@ dependencies = [
[[package]]
name = "gix-traverse"
version = "0.57.0"
version = "0.58.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a14b7052c0786676c03e71fcfde7d7f0f8e8316e642b5cec6bb3998719b2ce5c"
checksum = "e8de590ecc86a3b2870665f2288324fa9f7f8672c7fc2d4e020fdd81cd1f7aed"
dependencies = [
"bitflags",
"gix-commitgraph",
@@ -1544,7 +1419,6 @@ version = "0.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "66c50966184123caf580ffa64e28031a878597f1c7fceb8fe19566c38eb1b771"
dependencies = [
"bstr",
"fastrand",
"unicode-normalization",
]
@@ -1560,9 +1434,9 @@ dependencies = [
[[package]]
name = "gix-worktree"
version = "0.52.0"
version = "0.53.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d69955eb5e2910832f88d041964b809eee01dadd579237e0b55efec58fd406fd"
checksum = "cef414ed275e8407cd5d53d301e83be19700b0dd3f859d2434417b58f454a2d1"
dependencies = [
"bstr",
"gix-attributes",
@@ -1576,29 +1450,11 @@ dependencies = [
"gix-validate",
]
[[package]]
name = "gix-worktree-state"
version = "0.30.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8a96dccbcf9e8fe0291c55f06e08da93ebb2e691c1311276f541eefcc6d70800"
dependencies = [
"bstr",
"gix-features",
"gix-filter",
"gix-fs",
"gix-index",
"gix-object",
"gix-path",
"gix-worktree",
"io-close",
"thiserror",
]
[[package]]
name = "gix-worktree-stream"
version = "0.32.0"
version = "0.33.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9a8444b8ed4662e1a0c97f3eceda29630001a1bbb2632201e50312623e594213"
checksum = "d25e9ed30100c63f7590bc581c225e53f731a53e06aa79a245739c07f7dcc557"
dependencies = [
"gix-attributes",
"gix-error",
@@ -1677,6 +1533,8 @@ version = "0.17.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ed5909b6e89a2db4456e54cd5f673791d7eca6732202bbf2a9cc504fe2f9b84a"
dependencies = [
"allocator-api2",
"equivalent",
"foldhash 0.2.0",
]
@@ -1831,9 +1689,9 @@ dependencies = [
[[package]]
name = "ignore"
version = "0.4.25"
version = "0.4.26"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d3d782a365a015e0f5c04902246139249abf769125006fbe7649e2ee88169b4a"
checksum = "b915661dd01db3f05050265b2477bcc6527b3792388e2749b41623cc592be67d"
dependencies = [
"crossbeam-deque",
"globset",
@@ -1882,16 +1740,6 @@ dependencies = [
"logos",
]
[[package]]
name = "io-close"
version = "0.3.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9cadcf447f06744f8ce713d2d6239bb5bde2c357a452397a9ed90c625da390bc"
dependencies = [
"libc",
"winapi",
]
[[package]]
name = "is_terminal_polyfill"
version = "1.70.2"
@@ -1915,9 +1763,9 @@ checksum = "8f42a60cbdf9a97f5d2305f08a87dc4e09308d1276d28c869c684d7777685682"
[[package]]
name = "jiff"
version = "0.2.27"
version = "0.2.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "392c70591e8749fe235ddaf513e6f58b26bce3dcc16524cecc8936f75afa161e"
checksum = "4603d3033e49e2b0e31229fcab20a5d40089c607d975cd9c80551dc69eed9102"
dependencies = [
"jiff-static",
"jiff-tzdb-platform",
@@ -1930,9 +1778,9 @@ dependencies = [
[[package]]
name = "jiff-static"
version = "0.2.27"
version = "0.2.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "47b605b0c050d845fc355bb11eb3f9a8deddc218ea60c76e61aa1f2adfb2c96a"
checksum = "782d32378dddf207193ac91cefb848ad41abb58195c95168e1291227a0832b47"
dependencies = [
"proc-macro2",
"quote",
@@ -1965,6 +1813,7 @@ dependencies = [
"chrono",
"clap",
"etcetera",
"futures-util",
"git-conventional",
"inquire",
"jj-lib",
@@ -1978,9 +1827,9 @@ dependencies = [
[[package]]
name = "jj-lib"
version = "0.41.0"
version = "0.42.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "39b88d4463d0f0d5542b5b746cd0c3c3fa69d7fdbdfbe45e22bdb737fc47fa53"
checksum = "8d1647b1f02e5dee29a8c1c7946aab2cc9b1aa830c492c118886103fde8892a9"
dependencies = [
"async-trait",
"blake2",
@@ -2018,7 +1867,6 @@ dependencies = [
"strsim",
"tempfile",
"thiserror",
"tokio",
"toml_edit",
"tracing",
"winreg",
@@ -2026,9 +1874,9 @@ dependencies = [
[[package]]
name = "jj-lib-proc-macros"
version = "0.41.0"
version = "0.42.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a57bb4bbead2b2c6087d1b403e83b962d9da17a7c838aecc93646fcd047c29e4"
checksum = "a9025afcb9fb06cb7b81ebb19764a3f76d0ad0e442632227ce242c519de540df"
dependencies = [
"proc-macro2",
"quote",
@@ -2127,9 +1975,9 @@ dependencies = [
[[package]]
name = "log"
version = "0.4.30"
version = "0.4.32"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "616ec5685824bcc94416c6d4a7a446eea774a31efd7062c8480ba6fd06d7a6e5"
checksum = "953f07c43838f8e6f9758cab68bf5bed85465e7587ebe0b823f1bcd81978ad3a"
[[package]]
name = "logos"
@@ -2419,9 +2267,9 @@ dependencies = [
[[package]]
name = "prost"
version = "0.14.3"
version = "0.14.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d2ea70524a2f82d518bce41317d0fae74151505651af45faf1ffbd6fd33f0568"
checksum = "528ac67416ff8646872a3c02cad9cc4ee5dc9f9540c9b10771855c95cb2e5ae1"
dependencies = [
"bytes",
"prost-derive",
@@ -2429,9 +2277,9 @@ dependencies = [
[[package]]
name = "prost-derive"
version = "0.14.3"
version = "0.14.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "27c6023962132f4b30eb4c172c91ce92d933da334c59c23cddee82358ddafb0b"
checksum = "b570b25f7617e43d59005d0990ccb79e950a423952cea19671b7a876da390adf"
dependencies = [
"anyhow",
"itertools",
@@ -2711,9 +2559,9 @@ checksum = "dc6fe69c597f9c37bfeeeeeb33da3530379845f10be461a66d16d03eca2ded77"
[[package]]
name = "shlex"
version = "1.3.0"
version = "2.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
checksum = "f8fadd59c855ef2080decdef8ff161eb6661b86933c9d82e5ba29dc602a55aba"
[[package]]
name = "signal-hook"
@@ -2903,7 +2751,6 @@ version = "1.52.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8fc7f01b389ac15039e4dc9531aa973a135d7a4135281b12d7c1bc79fd57fffe"
dependencies = [
"bytes",
"pin-project-lite",
"tokio-macros",
]
@@ -3015,9 +2862,9 @@ dependencies = [
[[package]]
name = "typenum"
version = "1.20.0"
version = "1.20.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "40ce102ab67701b8526c123c1bab5cbe42d7040ccfd0f64af1a385808d2f43de"
checksum = "b6f5e870be6c3b371b77fe0ee0bafb859fa4964b4404c27de1d380043c4dda20"
[[package]]
name = "ucd-trie"
@@ -3069,9 +2916,9 @@ dependencies = [
[[package]]
name = "unicode-segmentation"
version = "1.13.2"
version = "1.13.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9629274872b2bfaf8d66f5f15725007f635594914870f65218920345aa11aa8c"
checksum = "c6f5d3c3b1bf09027a88a6bc961fc00497d651009560b5463668dc81b0fa87a8"
[[package]]
name = "unicode-width"
@@ -3341,9 +3188,6 @@ name = "winnow"
version = "0.7.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "df79d97927682d2fd8adb29682d1140b343be4ac0f08fd68b7765d9c059d3945"
dependencies = [
"memchr",
]
[[package]]
name = "winnow"
@@ -3466,9 +3310,9 @@ checksum = "1ffae5123b2d3fc086436f8834ae3ab053a283cfac8fe0a0b8eaae044768a4c4"
[[package]]
name = "yoke"
version = "0.8.2"
version = "0.8.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "abe8c5fda708d9ca3df187cae8bfb9ceda00dd96231bed36e445a1a48e66f9ca"
checksum = "709fe23a0424b6a435d82152b1bd3fdfb0833487d5fa90d05d42762a9891fef5"
dependencies = [
"stable_deref_trait",
"yoke-derive",
@@ -3489,18 +3333,18 @@ dependencies = [
[[package]]
name = "zerocopy"
version = "0.8.49"
version = "0.8.50"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bce33a6288fa3f072a8c2c7d0f2fdbb90e28298f0135c1f99b96c3db2efcc60b"
checksum = "3b065d4f0e55f82fae73202e189638116a87c55ab6b8e6c2721e13dd9d854ad1"
dependencies = [
"zerocopy-derive",
]
[[package]]
name = "zerocopy-derive"
version = "0.8.49"
version = "0.8.50"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8fd425244944f4ab65ccff928e7323354c5a018c75838362fdce749dfad2ee1e"
checksum = "0b631b19d36a892ab55420c92dbc83ccd79274f25be714855d3074aa71cab639"
dependencies = [
"proc-macro2",
"quote",
Cargo.toml
+11 -10
View File
@@ -24,21 +24,22 @@ test-utils = []
[dependencies]
async-trait = "0.1.89"
etcetera = "0.11.0"
clap = { version = "4.5.57", features = ["derive"] }
git-conventional = "0.12.9"
inquire = { version = "0.9.2", features = ["editor"] }
jj-lib = "0.41.0"
lazy-regex = { version = "3.5.1", features = ["lite"] }
clap = { version = "4.6.1", features = ["derive"] }
git-conventional = "1.1.0"
inquire = { version = "0.9.4", features = ["editor"] }
jj-lib = "0.42.0"
lazy-regex = { version = "3.6.0", features = ["lite"] }
thiserror = "2.0.18"
tokio = { version = "1.49.0", features = ["macros", "rt-multi-thread"] }
tokio = { version = "1.52.3", features = ["macros", "rt-multi-thread"] }
textwrap = "0.16.2"
unicode-width = "0.2.2"
chrono = "0.4.44"
chrono = "0.4.45"
futures-util = "0.3.32"
[dev-dependencies]
assert_cmd = "2.1.2"
assert_fs = "1.1.3"
predicates = "3.1.3"
assert_cmd = "2.2.2"
assert_fs = "1.1.4"
predicates = "3.1.4"
[lints.rust]
unexpected_cfgs = { level = "warn", check-cfg = ['cfg(tarpaulin_include)'] }
nix/make-binary.nix
+1 -1
View File
@@ -10,7 +10,7 @@
inherit version;
src = pkgs.lib.cleanSource ../.;
# cargoLock.lockFile = ../Cargo.lock;
cargoHash = "sha256-QfNC11XQ+qhdsxU6JWiHsvLnhn9xvxKaEPhhDJ2nM0c=";
cargoHash = "sha256-yfKaqc+7lvxDukAXxazc57GFs386rr9vUsDk1pobLRM=";
useNextest = true;
meta = {
inherit (cargoToml.package) description homepage;
src/jj/lib_executor.rs
+6 -4
View File
@@ -10,6 +10,7 @@ use std::{
};
use etcetera::BaseStrategy;
use futures_util::StreamExt;
use jj_lib::{
backend::CommitId,
config::{ConfigSource, StackedConfig},
@@ -151,7 +152,7 @@ impl JjLib {
}
/// Resolve a revset string to a commit ID
fn get_commit_id(&self, revset: &str) -> Result<CommitId, Error> {
async fn get_commit_id(&self, revset: &str) -> Result<CommitId, Error> {
let context = RevsetParseContext {
workspace: Some(RevsetWorkspaceContext {
workspace_name: &self.workspace_name,
@@ -182,12 +183,13 @@ impl JjLib {
let mut all_ids = revision.commit_change_ids();
let commit_id = all_ids
.next()
.await
.ok_or(Error::RevsetResolutionError {
revset: revset.into(),
context: "No matching revision".to_string(),
})?
.map_err(|e| Error::from_revset_evaluation_error(revset, e))?;
match all_ids.next() {
match all_ids.next().await {
None => Ok(commit_id.0),
Some(_) => Err(Error::MultipleRevisions {
revset: revset.to_string(),
@@ -212,7 +214,7 @@ impl JjExecutor for JjLib {
}
async fn describe(&self, revset: &str, message: &str) -> Result<(), Error> {
let commit_id = self.get_commit_id(revset)?;
let commit_id = self.get_commit_id(revset).await?;
let repo = self.repo.lock()?.clone();
let mut tx = repo.start_transaction();
let commit = tx
@@ -251,7 +253,7 @@ impl JjExecutor for JjLib {
}
async fn get_description(&self, revset: &str) -> Result<String, Error> {
let commit_id = self.get_commit_id(revset)?;
let commit_id = self.get_commit_id(revset).await?;
let repo = self.repo.lock()?.clone();
let commit = repo
.store()