feat(folder): add commit reset action in git log

Add a "Reset to Here" context action for git log commit items in the folder page.

Show a reset dialog with branch, target commit, commit message, and reset mode details for soft, mixed, hard, and keep.

Disable reset when viewing a non-current branch filter and keep the action ordering under commit diff.

Add git_reset support across Rust commands, Tauri invoke registration, web handlers/routes, and frontend API/type bindings.

Add localized reset labels, mode descriptions, and toast messages across all supported languages.
This commit is contained in:
xintaofei
2026-04-15 11:14:37 +08:00
parent 66549ce2f7
commit f3630ba48a
18 changed files with 600 additions and 21 deletions

View File

@@ -1154,6 +1154,36 @@ pub async fn git_checkout(path: String, branch_name: String) -> Result<(), AppCo
Ok(())
}
#[cfg_attr(feature = "tauri-runtime", tauri::command)]
pub async fn git_reset(
path: String,
commit: String,
mode: String,
) -> Result<(), AppCommandError> {
let mode = mode.trim().to_lowercase();
let mode_flag = match mode.as_str() {
"soft" | "mixed" | "hard" | "keep" => format!("--{mode}"),
_ => {
return Err(AppCommandError::invalid_input(
"Reset mode must be one of: soft, mixed, hard, keep",
))
}
};
let output = crate::process::tokio_command("git")
.args(["reset", mode_flag.as_str(), commit.as_str()])
.current_dir(&path)
.output()
.await
.map_err(AppCommandError::io)?;
if !output.status.success() {
return Err(git_command_error("reset", &output.stderr));
}
Ok(())
}
#[cfg_attr(feature = "tauri-runtime", tauri::command)]
pub async fn git_list_branches(path: String) -> Result<Vec<String>, AppCommandError> {
let output = crate::process::tokio_command("git")

View File

@@ -288,6 +288,7 @@ mod tauri_app {
folders::git_new_branch,
folders::git_worktree_add,
folders::git_checkout,
folders::git_reset,
folders::git_list_branches,
folders::git_stash_push,
folders::git_stash_pop,

View File

@@ -252,6 +252,21 @@ pub async fn git_checkout(
Ok(Json(()))
}
#[derive(Deserialize)]
#[serde(rename_all = "camelCase")]
pub struct GitResetParams {
pub path: String,
pub commit: String,
pub mode: String,
}
pub async fn git_reset(
Json(params): Json<GitResetParams>,
) -> Result<Json<()>, AppCommandError> {
folder_commands::git_reset(params.path, params.commit, params.mode).await?;
Ok(Json(()))
}
pub async fn git_list_branches(
Json(params): Json<PathParams>,
) -> Result<Json<Vec<String>>, AppCommandError> {

View File

@@ -181,6 +181,7 @@ pub fn build_router(state: Arc<AppState>, token: String, static_dir: std::path::
)
.route("/git_new_branch", post(handlers::git::git_new_branch))
.route("/git_checkout", post(handlers::git::git_checkout))
.route("/git_reset", post(handlers::git::git_reset))
.route("/git_delete_branch", post(handlers::git::git_delete_branch))
.route("/git_merge", post(handlers::git::git_merge))
.route("/git_rebase", post(handlers::git::git_rebase))