ok/jj
1
0
Fork 0
forked from mirrors/jj
Code Pull requests Activity

cli: describe: start transaction and set up rewritten commit early

Browse source 
This will help consolidate description_template_for_*() functions and port them
to templater. This change also means the committer (and operation start)
timestamp is set earlier. I think that's good.
This commit is contained in:
Yuya Nishihara 2024-07-19 12:47:28 +09:00
parent 69bb57d1d1
commit d637216c16
1 changed files with 23 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
cli/src/commands/describe.rs
View file

@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
use std::io::{self, Read, Write}; use std::io::{self, Read};
use jj_lib::object_id::ObjectId; use jj_lib::object_id::ObjectId;
use tracing::instrument; use tracing::instrument;
@ -69,6 +69,16 @@ pub(crate) fn cmd_describe(
let mut workspace_command = command.workspace_helper(ui)?; let mut workspace_command = command.workspace_helper(ui)?;
let commit = workspace_command.resolve_single_rev(&args.revision)?; let commit = workspace_command.resolve_single_rev(&args.revision)?;
workspace_command.check_rewritable([commit.id()])?; workspace_command.check_rewritable([commit.id()])?;
let mut tx = workspace_command.start_transaction();
let mut commit_builder = tx
.mut_repo()
.rewrite_commit(command.settings(), &commit)
.detach();
if args.reset_author {
commit_builder.set_author(commit_builder.committer().clone());
}
let description = if args.stdin { let description = if args.stdin {
let mut buffer = String::new(); let mut buffer = String::new();
io::stdin().read_to_string(&mut buffer)?; io::stdin().read_to_string(&mut buffer)?;
@ -78,24 +88,19 @@ pub(crate) fn cmd_describe(
} else if args.no_edit { } else if args.no_edit {
commit.description().to_owned() commit.description().to_owned()
} else { } else {
let template = let template = description_template_for_describe(
description_template_for_describe(ui, command.settings(), &workspace_command, &commit)?; ui,
edit_description(workspace_command.repo(), &template, command.settings())? command.settings(),
tx.base_workspace_helper(),
&commit,
)?;
edit_description(tx.base_repo(), &template, command.settings())?
}; };
if description == *commit.description() && !args.reset_author { commit_builder.set_description(description);
writeln!(ui.status(), "Nothing changed.")?;
} else { if commit_builder.description() != commit.description() || args.reset_author {
let mut tx = workspace_command.start_transaction(); commit_builder.write(tx.mut_repo())?;
let mut commit_builder = tx
.mut_repo()
.rewrite_commit(command.settings(), &commit)
.set_description(description);
if args.reset_author {
let new_author = commit_builder.committer().clone();
commit_builder = commit_builder.set_author(new_author);
} }
commit_builder.write()?;
tx.finish(ui, format!("describe commit {}", commit.id().hex()))?; tx.finish(ui, format!("describe commit {}", commit.id().hex()))?;
}
Ok(()) Ok(())
} }