mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2024-12-25 05:29:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

evolve: update working copy at end (if applicable)

Browse source 
The `evolve` command had TODOs about making it update the checkout and
the working copy after evolving commits. I've been running into that
(being left on an obsolete commit) quite often while dogfooding, so
let's fix it.
This commit is contained in:
Martin von Zweigbergk 2021-01-02 20:15:21 -08:00
parent ba4d2c8a24
commit f88e8b6086
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/commands.rs
View file

@ -1616,7 +1616,8 @@ fn cmd_evolve<'s>(
matches: &ArgMatches, matches: &ArgMatches,
_sub_matches: &ArgMatches, _sub_matches: &ArgMatches,
) -> Result<(), CommandError> { ) -> Result<(), CommandError> {
let repo = get_repo(ui, &matches)?; let mut repo = get_repo(ui, &matches)?;
let owned_wc = repo.working_copy().clone();
struct Listener<'a, 's, 'r> { struct Listener<'a, 's, 'r> {
ui: &'a mut Ui<'s>, ui: &'a mut Ui<'s>,
@ -1676,9 +1677,13 @@ fn cmd_evolve<'s>(
}; };
let mut tx = repo.start_transaction("evolve"); let mut tx = repo.start_transaction("evolve");
evolve(&user_settings, &mut tx, &mut listener); evolve(&user_settings, &mut tx, &mut listener);
// TODO: update checkout update_checkout_after_rewrite(ui, &mut tx);
tx.commit(); tx.commit();
// TODO: update working copy update_working_copy(
ui,
Arc::get_mut(&mut repo).unwrap(),
&owned_wc.lock().unwrap(),
)?;
Ok(()) Ok(())
} }