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.

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

fix(package): use relpath to cwd for vcs dirtiness report #14970

Merged
merged 2 commits into from
Dec 20, 2024

Conversation

weihanglo
Copy link
Member

What does this PR try to resolve?

Address #14968 (comment)

I think the ideal solution is to be relative to the current directory but that takes more work and this incremental improvement is great!

Sorry I should have noticed your comment earlier.

@rustbot
Copy link
Collaborator

rustbot commented Dec 20, 2024

r? @ehuss

rustbot has assigned @ehuss.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@rustbot rustbot added Command-package S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Dec 20, 2024
@epage epage changed the title test(package): relative path to cwd for dirtiness report fix(package): use relpath to cwd for vcs dirtiness report Dec 20, 2024
@epage
Copy link
Contributor

epage commented Dec 20, 2024

Sorry I should have noticed your comment earlier.

I intentionally didn't block on it or raise it as a concern. This is my "ideal" but there are multiple points of view to be had and the risk of details that weren't blocking the PR.

I leave it to you if you'd want to move this forward.

@weihanglo
Copy link
Member Author

weihanglo commented Dec 20, 2024

The working directory can be seen as either git's workdir, or user's current working directory. Since the dirtiness check is more a Git thing, this PR makes more sense to me as it is how Git shows it.

[ERROR] 1 files in the working directory contain changes that were not yet committed into git:

../Cargo.toml

to proceed despite this and include the uncommitted changes, pass the `--allow-dirty` flag

@weihanglo weihanglo added this pull request to the merge queue Dec 20, 2024
Merged via the queue into rust-lang:master with commit 652623b Dec 20, 2024
20 checks passed
@weihanglo weihanglo deleted the relpath branch December 20, 2024 16:13
bors added a commit to rust-lang-ci/rust that referenced this pull request Dec 21, 2024
Update cargo

10 commits in 99dff6d77db779716dda9ca3b29c26addd02c1be..652623b779c88fe44afede28bf7f1c9c07812511
2024-12-18 00:55:17 +0000 to 2024-12-20 15:44:42 +0000
- fix(package): use relpath to cwd for vcs dirtiness report (rust-lang/cargo#14970)
- Enable triagebot merge conflict notifications (rust-lang/cargo#14972)
- fixed the error message for a user to open the crate (rust-lang/cargo#14969)
- fix(package): show dirty filepaths relative to git workdir (rust-lang/cargo#14968)
- Add the `test` cfg as a well known cfg before of compiler change (rust-lang/cargo#14963)
- refactor(cargo-package): let-else to flatten code (rust-lang/cargo#14959)
- fix(cargo-package): add more traces (rust-lang/cargo#14960)
- Do not hash absolute sysroot path into stdlib crates metadata. (rust-lang/cargo#14951)
- docs: add missing argument to Rustup Cargo workaround (rust-lang/cargo#14954)
- fix(cargo-rustc): stabilize higher precedence trailing flags (rust-lang/cargo#14900)
@rustbot rustbot added this to the 1.85.0 milestone Dec 21, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Command-package S-waiting-on-review Status: Awaiting review from the assignee but also interested parties.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants