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

cli: make jj status get the working copy commit from the view

Browse source 
This prepares `jj status` for working better on an old repo state
(with `--at-op`). When looking at an old repo state, the "working
copy" should reflect the state from that state, i.e. the view's
"checkout", not the current working copy.
This commit is contained in:
Martin von Zweigbergk 2021-05-28 10:50:46 -07:00
parent 11005ae9b8
commit b48e06a94b
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/commands.rs
View file

@ -298,13 +298,12 @@ impl RepoCommandHelper {
Ok(())
}
fn commit_working_copy(&mut self) -> Commit {
let (reloaded_repo, commit) = self
fn commit_working_copy(&mut self) {
let (reloaded_repo, _) = self
.repo
.working_copy_locked()
.commit(&self.settings, self.repo.clone());
self.repo = reloaded_repo;
commit
}
fn start_transaction(&self, description: &str) -> Transaction {
@ -1149,8 +1148,9 @@ fn cmd_status(
_sub_matches: &ArgMatches,
) -> Result<(), CommandError> {
let mut repo_command = command.repo_helper(ui)?;
let commit = repo_command.commit_working_copy();
repo_command.commit_working_copy();
let repo = repo_command.repo();
let commit = repo.store().get_commit(repo.view().checkout()).unwrap();
ui.write("Parent commit: ")?;
ui.write_commit_summary(repo.as_repo_ref(), &commit.parents()[0])?;
ui.write("\n")?;