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

cli: teach jj discard to discard a public head

Browse source 
I'm not sure what the interface should be, but until public heads are
automatically removed when they disappear from a remote, this will at
least be useful as a workaround.
This commit is contained in:
Martin von Zweigbergk 2021-09-10 18:33:28 -07:00
parent 15858b7630
commit be64e5118d
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/commands.rs
View file

@ -1010,6 +1010,11 @@ With the `--from` and/or `--to` options, shows the difference from/to the given
.index(1)
.default_value("@")
.help("The revision to discard"),
)
.arg(
Arg::with_name("public")
.long("public")
.help("Discard a public head"),
);
let restore_command = SubCommand::with_name("restore")
.about("Restore paths from another revision")
@ -2396,7 +2401,11 @@ fn cmd_discard(
let commit = repo_command.resolve_revision_arg(ui, sub_matches)?;
let mut tx = repo_command.start_transaction(&format!("discard commit {}", commit.id().hex()));
let mut_repo = tx.mut_repo();
mut_repo.remove_head(&commit);
if sub_matches.is_present("public") {
mut_repo.remove_public_head(&commit);
} else {
mut_repo.remove_head(&commit);
}
for parent in commit.parents() {
mut_repo.add_head(&parent);
}