mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2024-10-23 15:00:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Add configuration option to override branch name prefix.

Browse source
This commit is contained in:
Tal Pressman 2022-05-24 18:52:45 +09:00
parent 044bc93aeb
commit 9831b82a98
3 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CHANGELOG.md
View file

@ -78,7 +78,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
* `jj git push` gained a `--change <revision>` argument. When that's used, it
will create a branch named after the revision's change ID, so you don't have
to create a branch yourself.
to create a branch yourself. By default, the branch name will start with
`push-`, but this can be overridden by the `push.branch-prefix` config
setting.
* Diff editor command arguments can now be specified by config file.
Example:

6
lib/src/settings.rs
View file

@ -65,6 +65,12 @@ impl UserSettings {
.unwrap_or_else(|_| "(no email configured)".to_string())
}
pub fn push_branch_prefix(&self) -> String {
self.config
.get_string("push.branch-prefix")
.unwrap_or("push-".to_string())
}
pub fn signature(&self) -> Signature {
let timestamp = self.timestamp.clone().unwrap_or_else(Timestamp::now);
Signature {

6
src/commands.rs
View file

@ -4857,7 +4857,11 @@ fn cmd_git_push(
}
} else if let Some(change_str) = &args.change {
let commit = workspace_command.resolve_single_rev(ui, change_str)?;
let branch_name = format!("push-{}", commit.change_id().hex());
let branch_name = format!(
"{}{}",
ui.settings().push_branch_prefix(),
commit.change_id().hex()
);
tx.mut_repo()
.set_local_branch(branch_name.clone(), RefTarget::Normal(commit.id().clone()));
if let Some(update) =