-
Notifications
You must be signed in to change notification settings - Fork 2.4k
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
Migrate package include/exclude to gitignore patterns. #6924
Conversation
r? @nrc (rust_highfive has picked a reviewer for you, use r? to override) |
I'm on the fence about describing the gitignore patterns in the docs. It takes up a little more space than I'd like, but I think it is useful to include. |
This looks great to me, thanks for all the new tests and for pushing this forward! I personally feel like the current state of the docs is best where it links to the reference and otherwise jots down a few notes for convenience. @bors: r+ |
📌 Commit d3472ce5ebe2bb88097d90d081fc757f6eab48f6 has been approved by |
🔒 Merge conflict This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again. How do I rebase?Assuming
You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial. Please avoid the "Resolve conflicts" button on GitHub. It uses Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Error message
|
☔ The latest upstream changes (presumably #6925) made this pull request unmergeable. Please resolve the merge conflicts. |
d3472ce
to
db3328e
Compare
@bors r=alexcrichton |
📌 Commit db3328e has been approved by |
Migrate package include/exclude to gitignore patterns. This moves to the next phase of #4268. This also includes a fdew more changes which can be removed if desired: - Add support for `!` negate gitignore patterns. - Add a warning if both package.include and package.exclude are specified.
☀️ Test successful - checks-travis, status-appveyor |
Update cargo 17 commits in 759b6161a328db1d4863139e90875308ecd25a75..c4fcfb725b4be00c72eb9cf30c7d8b095577c280 2019-05-06 20:47:49 +0000 to 2019-05-15 19:48:47 +0000 - tests: registry: revert readonly permission after running tests. (rust-lang/cargo#6947) - Remove Candidate (rust-lang/cargo#6946) - Fix for "Running cargo update without a Cargo.lock ignores arguments" rust-lang/cargo#6872 (rust-lang/cargo#6904) - Fix a minor mistake in the changelog. (rust-lang/cargo#6944) - Give a better error message when crates.io requests time out (rust-lang/cargo#6936) - Re-enable compatibility with readonly CARGO_HOME (rust-lang/cargo#6940) - Fix version of `ignore`. (rust-lang/cargo#6938) - Stabilize offline mode. (rust-lang/cargo#6934) - zsh: Add doc options to include non-public items documentation (rust-lang/cargo#6929) - zsh: Suggest --lib option as binary template now the default (rust-lang/cargo#6926) - Migrate package include/exclude to gitignore patterns. (rust-lang/cargo#6924) - Implement the Cargo half of pipelined compilation (take 2) (rust-lang/cargo#6883) - Always include `Cargo.toml` when packaging. (rust-lang/cargo#6925) - Remove unnecessary calls to masquerade_as_nightly_cargo. (rust-lang/cargo#6923) - download: fix "Downloaded 1 crates" message (crates -> crate) (rust-lang/cargo#6920) - Changed RUST_LOG usage to CARGO_LOG to avoid confusion. (rust-lang/cargo#6918) - crate download: don't print that a crate was the largest download if it was the only download (rust-lang/cargo#6916)
Thanks for working on this, @ehuss! :) |
Remove include/exclude glob warning. This removes the warning when a package include/exclude pattern produces different results from glob vs gitignore. The pre-warnings were added in 1.21 (released 2017-10-12) #4270. The migration was done in 1.36 (released 2019-07-04) #6924. This will remove the warnings in 1.38 (to be released 2019-09-26). Closes #4268
This moves to the next phase of #4268.
This also includes a few more changes which can be removed if desired:
!
negate gitignore patterns.