Skip to content
Merged
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
4 changes: 2 additions & 2 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,8 @@ sha2 = "0.10"
base64 = "0.22"
ed25519-dalek = "2"
criterion = "0.5"
automonique-platform-client = { git = "https://github.com/bext-stack/automonique", rev = "7d2fad53558ccb38ef3fdb12945974f75a0e73ce" }
automonique-protocol = { git = "https://github.com/bext-stack/automonique", rev = "7d2fad53558ccb38ef3fdb12945974f75a0e73ce" }
automonique-platform-client = { git = "https://github.com/bext-stack/automonique", rev = "524073c3a55ec73d57e4b05abf5ba3eb0abd4cb7" }
automonique-protocol = { git = "https://github.com/bext-stack/automonique", rev = "524073c3a55ec73d57e4b05abf5ba3eb0abd4cb7" }
windows-sys = { version = "0.60", features = [
"Win32_Foundation",
"Win32_Security",
Expand Down
11 changes: 9 additions & 2 deletions crates/shelldeck-core/locales/en.toml
Original file line number Diff line number Diff line change
Expand Up @@ -1249,9 +1249,16 @@ fleet.review.lane_untracked = "Untracked"
fleet.review.lane_partial = "partially staged"
fleet.review.staging_proposed = "%{action} · proposal %{id}"
fleet.review.staging_blocked = "%{action} · blocked · proposal %{id}"
fleet.review.staging_withheld_title = "Staging is read-only"
fleet.review.staging_withheld_no_server_capability = "The server advertises no staging capability for this snapshot: Platform v2 defines neither a staging confirmation digest nor a receipt correlation, and hunk-level granularity is not representable in it. Staged, unstaged, untracked and conflict state stay visible, with no staging control."
fleet.review.staging_withheld_title = "Staging is unavailable"
fleet.review.staging_withheld_no_server_capability = "No capability response is attributed to this project, workspace and snapshot revision: nothing has been advertised, so no staging control is offered."
fleet.review.staging_withheld_no_stageable_proposal = "The server advertises no staging and no conflict resolution for this snapshot: the registry binding does not grant it, the repository could not be read, or the worktree is in a state no write can fence exactly once. The advertisement is re-read on every refresh, including after a write."
fleet.review.staging_withheld_no_custody_lane = "Durable custody is unavailable in this process: no staging control is offered."
fleet.review.staging_observation = "Server fence, HEAD %{head} · index %{index}"
fleet.review.prepare_stage = "Stage"
fleet.review.prepare_unstage = "Unstage"
fleet.review.prepare_commit = "Commit"
fleet.review.resolve_keep_current = "Keep current"
fleet.review.resolve_keep_incoming = "Keep incoming"
fleet.review.preview_text = "Sanitized text preview"
fleet.review.preview_image = "Image %{media} · %{width}×%{height} px · %{bytes} bytes"
fleet.review.preview_image_box = "Bounded preview, never decoded"
Expand Down
11 changes: 9 additions & 2 deletions crates/shelldeck-core/locales/fr.toml
Original file line number Diff line number Diff line change
Expand Up @@ -1249,9 +1249,16 @@ fleet.review.lane_untracked = "Non suivi"
fleet.review.lane_partial = "partiellement indexé"
fleet.review.staging_proposed = "%{action} · proposition %{id}"
fleet.review.staging_blocked = "%{action} · bloqué · proposition %{id}"
fleet.review.staging_withheld_title = "Indexation en lecture seule"
fleet.review.staging_withheld_no_server_capability = "Le serveur n’annonce aucune capacité d’indexation pour cet instantané : Platform v2 ne définit ni digest de confirmation ni corrélation de reçu pour l’indexation, et la granularité au niveau du bloc n’y est pas représentable. L’état indexé, non indexé, non suivi et en conflit reste affiché, sans commande d’indexation."
fleet.review.staging_withheld_title = "Indexation indisponible"
fleet.review.staging_withheld_no_server_capability = "Aucune réponse de capacité n’est attribuée à ce projet, cet espace et cette révision d’instantané : rien n’a été annoncé, donc aucune commande d’indexation n’est proposée."
fleet.review.staging_withheld_no_stageable_proposal = "Le serveur n’annonce aucune indexation ni résolution de conflit pour cet instantané : la liaison du registre ne l’accorde pas, le dépôt n’a pas pu être lu, ou l’arbre de travail est dans un état qu’aucune écriture ne peut clôturer exactement une fois. L’annonce est relue à chaque rafraîchissement, y compris après une écriture."
fleet.review.staging_withheld_no_custody_lane = "La garde durable est indisponible dans ce processus : aucune commande d’indexation n’est proposée."
fleet.review.staging_observation = "Barrière serveur, HEAD %{head} · index %{index}"
fleet.review.prepare_stage = "Indexer"
fleet.review.prepare_unstage = "Désindexer"
fleet.review.prepare_commit = "Valider"
fleet.review.resolve_keep_current = "Garder la version actuelle"
fleet.review.resolve_keep_incoming = "Garder la version entrante"
fleet.review.preview_text = "Aperçu texte assaini"
fleet.review.preview_image = "Image %{media} · %{width}×%{height} px · %{bytes} octets"
fleet.review.preview_image_box = "Aperçu borné, jamais décodé"
Expand Down
4 changes: 3 additions & 1 deletion crates/shelldeck-core/src/config/platform.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1684,7 +1684,8 @@ mod tests {
use automonique_protocol::platform_v2_transport::{
PlatformNegotiationResponse, PlatformV2Refusal, PlatformV2Request, PlatformV2Response,
ReviewCapabilities, ReviewCheckRerunCapability, ReviewConfirmationDigest,
ReviewPullRequestCapabilities, ReviewReceiptCorrelationDigest,
ReviewGitStagingCapabilities, ReviewPullRequestCapabilities,
ReviewReceiptCorrelationDigest,
};

let snapshot = decode_review_snapshot(include_bytes!(
Expand Down Expand Up @@ -1718,6 +1719,7 @@ mod tests {
.unwrap()],
Vec::new(),
ReviewPullRequestCapabilities::default(),
ReviewGitStagingCapabilities::default(),
)
.unwrap();
let negotiated = || {
Expand Down
Loading
Loading