HomePhorge
Diffusion jjorge (trunk) Code

jjorge/src/backend/git/transaction.rs
ac15429426ddtrunk

Last Change
Raw File

transaction.rs
View Options

// use std::sync::Arc;
// use jj_lib::{
// commit::Commit,
// object_id::ObjectId as _,
// op_store::WorkspaceId,
// repo::{ReadonlyRepo, Repo as _},
// transaction::Transaction,
// workspace::Workspace,
// };
// use tracing::instrument;
// pub struct FinishTransaction {
// workspace: Workspace,
// }
// impl FinishTransaction {
// pub fn new(workspace: Workspace) -> Self {
// Self { workspace }
// }
// #[instrument(skip(self))]
// fn finish(
// &mut self,
// transaction: &Transaction,
// description: &str,
// ) -> Result<Arc<ReadonlyRepo>, String> {
// if !self.transaction.repo().has_changes() {
// return Ok(self.transaction.base_repo().clone());
// }
// let num_rebased = self
// .transaction
// .repo_mut()
// .rebase_descendants()
// .map_err(|err| format!("Failed to rebase descendants: {err}"))?;
// if num_rebased > 0 {
// tracing::debug!("Rebased {num_rebased} descendant commits");
// }
// let old_repo = self.transaction.base_repo().clone();
// let workspace_id = self.workspace.workspace_id();
// let maybe_old_wc_commit = old_repo
// .view()
// .get_wc_commit_id(&workspace_id)
// .map(|commit_id| self.transaction.base_repo().store().get_commit(commit_id))
// .transpose()
// .map_err(|err| format!("Failed to get old working copy commit: {err}"))?;
// let maybe_new_wc_commit = self
// .transaction
// .repo()
// .view()
// .get_wc_commit_id(&workspace_id)
// .map(|commit_id| self.transaction.repo().store().get_commit(commit_id))
// .transpose()
// .map_err(|err| format!("Failed to get new working copy commit: {err}"))?;
// if let Some(wc_commit) = &maybe_new_wc_commit {
// jj_lib::git::reset_head(self.transaction.repo_mut(), wc_commit)
// .map_err(|err| format!("Failed to reset HEAD: {err}"))?;
// }
// let repository = self
// .transaction
// .commit(description)
// .map_err(|err| format!("Failed to commit transaction: {err}"))?;
// // Update working copy before reporting repo changes, so that
// // potential errors while reporting changes (broken pipe, etc)
// // don't leave the working copy in a stale state.
// if let Some(new_commit) = &maybe_new_wc_commit {
// self.update_working_copy(maybe_old_wc_commit.as_ref(), new_commit)?;
// } else {
// // It seems the workspace was deleted, so we shouldn't try to
// // update it.
// }
// Ok(repository)
// }
// fn update_working_copy(
// &mut self,
// old_commit: Option<&Commit>,
// new_commit: &Commit,
// ) -> Result<(), String> {
// let old_tree_id = old_commit.map(|commit| commit.tree_id().clone());
// // TODO: CheckoutError::ConcurrentCheckout should probably just result in a
// // warning for most commands (but be an error for the checkout command)
// let stats = self
// .workspace
// .check_out(
// repo.op_id().clone(),
// old_tree_id.as_ref(),
// new_commit,
// options,
// )
// .map_err(|err| {
// return Err(format!(
// "Failed to check out commit {}: {}",
// new_commit.id().hex(),
// err
// ));
// })?;
// Ok(())
// }
// }

Owner Packages

  • No Owners