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

cli: use MergedTreeBuilder in jj chmod

Browse source
This commit is contained in:
Martin von Zweigbergk 2023-08-25 13:37:42 -07:00 committed by Martin von Zweigbergk
parent 389f27f042
commit d0fb154e7e
3 changed files with 20 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
cli/src/commands/mod.rs
View file

@ -37,7 +37,7 @@ use jj_lib::dag_walk::topo_order_reverse;
use jj_lib::git_backend::GitBackend;
use jj_lib::matchers::EverythingMatcher;
use jj_lib::merge::Merge;
use jj_lib::merged_tree::MergedTree;
use jj_lib::merged_tree::{MergedTree, MergedTreeBuilder};
use jj_lib::op_store::WorkspaceId;
use jj_lib::repo::{ReadonlyRepo, Repo};
use jj_lib::repo_path::RepoPath;
@ -2659,7 +2659,7 @@ fn cmd_chmod(ui: &mut Ui, command: &CommandHelper, args: &ChmodArgs) -> Result<(
));
let tree = commit.tree();
let store = tree.store();
let mut tree_builder = store.tree_builder(tree.id().clone());
let mut tree_builder = MergedTreeBuilder::new(store.clone(), commit.merged_tree_id().clone());
for repo_path in repo_paths {
let user_error_with_path = |msg: &str| {
user_error(format!(
@ -2669,10 +2669,10 @@ fn cmd_chmod(ui: &mut Ui, command: &CommandHelper, args: &ChmodArgs) -> Result<(
};
let new_tree_value = match tree.path_value(&repo_path) {
None => return Err(user_error_with_path("No such path")),
Some(TreeValue::File { id, executable: _ }) => TreeValue::File {
Some(TreeValue::File { id, executable: _ }) => Merge::normal(TreeValue::File {
id,
executable: executable_bit,
},
}),
Some(TreeValue::Conflict(id)) => {
let conflict = tree.store().read_conflict(&repo_path, &id)?;
let all_files = conflict
@ -2685,7 +2685,7 @@ fn cmd_chmod(ui: &mut Ui, command: &CommandHelper, args: &ChmodArgs) -> Result<(
"Some of the sides of the conflict are not files",
));
}
let new_conflict = conflict.map(|value| match value {
conflict.map(|value| match value {
Some(TreeValue::File { id, executable: _ }) => Some(TreeValue::File {
id: id.clone(),
executable: executable_bit,
@ -2694,18 +2694,17 @@ fn cmd_chmod(ui: &mut Ui, command: &CommandHelper, args: &ChmodArgs) -> Result<(
panic!("Conflict sides must not themselves be conflicts")
}
value => value.clone(),
});
let new_conflict_id = store.write_conflict(&repo_path, &new_conflict)?;
TreeValue::Conflict(new_conflict_id)
})
}
Some(_) => return Err(user_error_with_path("Found neither a file nor a conflict")),
};
tree_builder.set(repo_path, new_tree_value);
tree_builder.set_or_remove(repo_path, new_tree_value);
}
let new_tree_id = tree_builder.write_tree()?;
tx.mut_repo()
.rewrite_commit(command.settings(), &commit)
.set_tree(tree_builder.write_tree())
.set_tree_id(new_tree_id)
.write()?;
tx.finish(ui)
}

4
lib/src/commit.rs
View file

@ -128,6 +128,10 @@ impl Commit {
self.data.root_tree.as_legacy_tree_id()
}
pub fn merged_tree_id(&self) -> &MergedTreeId {
&self.data.root_tree
}
pub fn change_id(&self) -> &ChangeId {
&self.data.change_id
}

7
lib/src/commit_builder.rs
View file

@ -109,11 +109,18 @@ impl CommitBuilder<'_> {
self.commit.root_tree.as_legacy_tree_id()
}
// TODO(#1624): delete when all callers have been updated to support tree-level
// conflicts
pub fn set_tree(mut self, tree_id: TreeId) -> Self {
self.commit.root_tree = MergedTreeId::Legacy(tree_id);
self
}
pub fn set_tree_id(mut self, tree_id: MergedTreeId) -> Self {
self.commit.root_tree = tree_id;
self
}
pub fn change_id(&self) -> &ChangeId {
&self.commit.change_id
}