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): show dirty filepaths relative to git workdir #14968

Merged
merged 3 commits into from
Dec 19, 2024

Conversation

weihanglo
Copy link
Member

What does this PR try to resolve?

Dirty file paths in the original message were stripped relative to package root.
User is not able to know the full path to find dirty files.

This PR makes it relative to git workdir.

How should we test and review this PR?

This was found during #14962

@rustbot
Copy link
Collaborator

rustbot commented Dec 19, 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 19, 2024
@epage epage enabled auto-merge December 19, 2024 22:43
@epage
Copy link
Contributor

epage commented Dec 19, 2024

This doesn't matter for stable cargo package because its not ambiguous but it will for cargo package --workspace.

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

@epage epage added this pull request to the merge queue Dec 19, 2024
@weihanglo
Copy link
Member Author

This doesn't matter for stable cargo package because its not ambiguous but it will for cargo package --workspace.

We have the --workspace flag for cargo package on stable for along while, so it does affect stable Cargo.

Merged via the queue into rust-lang:master with commit 71678a4 Dec 19, 2024
20 checks passed
@weihanglo weihanglo deleted the show-relpath branch December 19, 2024 23:44
weihanglo added a commit to weihanglo/cargo that referenced this pull request Dec 20, 2024
github-merge-queue bot pushed a commit that referenced this pull request Dec 20, 2024
### 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.
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