Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add error message when cargo fix on an empty repo #11400

Merged
merged 5 commits into from
Nov 28, 2022
Merged

Add error message when cargo fix on an empty repo #11400

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a1f2f5a
Add error message when `cargo fix` on an empty repo
Rustin170506 Nov 22, 2022
89b8a8b
Suppress error with `--allow-dirty` and add a test
Rustin170506 Nov 22, 2022
25f7d4b
Remove new_repo_without_add_and_commit
Rustin170506 Nov 22, 2022
3189dc3
Include untracked files
Rustin170506 Nov 26, 2022
21b2fe9
Fix fix_in_existing_repo_weird_ignore broken test
Rustin170506 Nov 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/cargo/ops/fix.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,7 @@ fn check_version_control(config: &Config, opts: &FixOptions) -> CargoResult<()>
if let Ok(repo) = git2::Repository::discover(config.cwd()) {
let mut repo_opts = git2::StatusOptions::new();
repo_opts.include_ignored(false);
repo_opts.include_untracked(true);
for status in repo.statuses(Some(&mut repo_opts))?.iter() {
if let Some(path) = status.path() {
match status.status() {
Expand Down
34 changes: 30 additions & 4 deletions tests/testsuite/fix.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

use cargo::core::Edition;
use cargo_test_support::compare::assert_match_exact;
use cargo_test_support::git;
use cargo_test_support::git::{self, init};
use cargo_test_support::paths::{self, CargoPathExt};
use cargo_test_support::registry::{Dependency, Package};
use cargo_test_support::tools;
Expand Down Expand Up @@ -771,6 +771,32 @@ commit the changes to these files:
p.cargo("fix --allow-staged").run();
}

#[cargo_test]
fn errors_about_untracked_files() {
let mut git_project = project().at("foo");
git_project = git_project.file("src/lib.rs", "pub fn foo() {}");
let p = git_project.build();
let _ = init(&p.root());

p.cargo("fix")
.with_status(101)
.with_stderr(
"\
error: the working directory of this package has uncommitted changes, \
and `cargo fix` can potentially perform destructive changes; if you'd \
like to suppress this error pass `--allow-dirty`, `--allow-staged`, or \
commit the changes to these files:

* Cargo.toml (dirty)
* src/ (dirty)


",
)
.run();
p.cargo("fix --allow-dirty").run();
}

#[cargo_test]
fn does_not_warn_about_clean_working_directory() {
let p = git::new("foo", |p| p.file("src/lib.rs", "pub fn foo() {}"));
Expand Down Expand Up @@ -1405,7 +1431,7 @@ fn fix_in_existing_repo_weird_ignore() {
let p = git::new("foo", |project| {
project
.file("src/lib.rs", "")
.file(".gitignore", "foo\ninner\n")
.file(".gitignore", "foo\ninner\nCargo.lock\ntarget\n")
.file("inner/file", "")
});

Expand Down Expand Up @@ -1715,7 +1741,7 @@ fn fix_with_run_cargo_in_proc_macros() {
"src/lib.rs",
r#"
use proc_macro::*;

#[proc_macro]
pub fn foo(_input: TokenStream) -> TokenStream {
let output = std::process::Command::new(env!("CARGO"))
Expand All @@ -1725,7 +1751,7 @@ fn fix_with_run_cargo_in_proc_macros() {
eprintln!("{}", std::str::from_utf8(&output.stderr).unwrap());
println!("{}", std::str::from_utf8(&output.stdout).unwrap());
"".parse().unwrap()
}
}
"#,
)
.file(
Expand Down