Skip to content

Commit

Permalink
Warn user about the working copy when configuring the author
Browse files Browse the repository at this point in the history
  • Loading branch information
InCogNiTo124 committed Jul 21, 2024
1 parent 8df7857 commit 80a61ec
Show file tree
Hide file tree
Showing 2 changed files with 70 additions and 1 deletion.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,8 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

* New `diff_contains()` revset function can be used to search diffs.

* When reconfiguring the author, warn that the working copy won't be updated

### Fixed bugs

* `jj diff --git` no longer shows the contents of binary files.
Expand Down
69 changes: 68 additions & 1 deletion cli/src/commands/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,11 @@

use std::io::Write;

use jj_lib::commit::Commit;
use jj_lib::repo::Repo;
use tracing::instrument;

use crate::cli_util::WorkspaceCommandHelper;
use crate::cli_util::{get_new_config_file_path, run_ui_editor, CommandHelper};
use crate::command_error::{config_error, user_error, CommandError};
use crate::config::{
Expand Down Expand Up @@ -285,7 +288,7 @@ pub(crate) fn cmd_config_get(

#[instrument(skip_all)]
pub(crate) fn cmd_config_set(
_ui: &mut Ui,
ui: &mut Ui,
command: &CommandHelper,
args: &ConfigSetArgs,
) -> Result<(), CommandError> {
Expand All @@ -296,9 +299,73 @@ pub(crate) fn cmd_config_set(
path = config_path.display()
)));
}

// If the user is trying to change the author config, we should warn them that
// it won't affect the working copy author
if args.name == ConfigNamePathBuf::from_iter(vec!["user", "name"]) {
check_wc_user_name(command, ui, &args.value)?;
} else if args.name == ConfigNamePathBuf::from_iter(vec!["user", "email"]) {
check_wc_user_email(command, ui, &args.value)?;
};

write_config_value_to_file(&args.name, &args.value, &config_path)
}

/// Returns the commit of the working copy if it exists.
fn maybe_wc_commit(helper: &WorkspaceCommandHelper) -> Option<Commit> {
let repo = helper.repo();
let maybe_wc_commit = helper
.get_wc_commit_id()
.map(|id| repo.store().get_commit(id))
.transpose()
.unwrap();
maybe_wc_commit
}

/// Check if the working copy author name matches the user's config value
/// If it doesn't, print a warning message
fn check_wc_user_name(
command: &CommandHelper,
ui: &mut Ui,
user_name: &str,
) -> Result<(), CommandError> {
let helper = command.workspace_helper(ui)?;
if let Some(wc_commit) = maybe_wc_commit(&helper) {
let author = wc_commit.author();
if author.name != user_name {
warn_wc_author(&author.name, &author.email, ui)?
}
};
Ok(())
}

/// Check if the working copy author email matches the user's config value
/// If it doesn't, print a warning message
fn check_wc_user_email(
command: &CommandHelper,
ui: &mut Ui,
user_email: &str,
) -> Result<(), CommandError> {
let helper = command.workspace_helper(ui)?;
if let Some(wc_commit) = maybe_wc_commit(&helper) {
let author = wc_commit.author();
if author.email != user_email {
warn_wc_author(&author.name, &author.email, ui)?
}
};
Ok(())
}

/// Prints a warning message about the working copy to the user
fn warn_wc_author(user_name: &str, user_email: &str, ui: &mut Ui) -> Result<(), CommandError> {
Ok(writeln!(
ui.warning_default(),
"This setting will only impact future commits.\nThe author of the working copy will stay \
\"{user_name} <{user_email}>\". \nTo change it, use \"jj describe --reset-author \
--no-edit\""
)?)
}

#[instrument(skip_all)]
pub(crate) fn cmd_config_edit(
_ui: &mut Ui,
Expand Down

0 comments on commit 80a61ec

Please sign in to comment.