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

Escape filenames and paths in HTML when generating index pages #8317

Merged
merged 10 commits into from
Apr 11, 2024

Conversation

Dreamsorcerer
Copy link
Member

No description provided.

@Dreamsorcerer Dreamsorcerer added backport-3.9 backport-3.10 Trigger automatic backporting to the 3.10 release branch by Patchback robot labels Apr 8, 2024
@Dreamsorcerer Dreamsorcerer added the bot:chronographer:skip This PR does not need to include a change note label Apr 8, 2024
@Dreamsorcerer
Copy link
Member Author

@bdraco We have a problem with Windows on this one.

@Dreamsorcerer Dreamsorcerer removed the bot:chronographer:skip This PR does not need to include a change note label Apr 11, 2024
@psf-chronographer psf-chronographer bot added the bot:chronographer:provided There is a change note present in this PR label Apr 11, 2024
Copy link

codecov bot commented Apr 11, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 97.55%. Comparing base (c29945a) to head (e3935e0).

Additional details and impacted files
@@           Coverage Diff           @@
##           master    #8317   +/-   ##
=======================================
  Coverage   97.55%   97.55%           
=======================================
  Files         107      107           
  Lines       33013    33038   +25     
  Branches     3867     3875    +8     
=======================================
+ Hits        32205    32230   +25     
  Misses        589      589           
  Partials      219      219           
Flag Coverage Δ
CI-GHA 97.46% <100.00%> (+<0.01%) ⬆️
OS-Linux 97.13% <100.00%> (+<0.01%) ⬆️
OS-Windows 95.57% <57.14%> (-0.05%) ⬇️
OS-macOS 96.79% <57.14%> (-0.05%) ⬇️
Py-3.10.11 95.42% <53.57%> (-0.05%) ⬇️
Py-3.10.14 96.94% <96.42%> (-0.01%) ⬇️
Py-3.11.8 ?
Py-3.11.9 97.13% <96.42%> (-0.01%) ⬇️
Py-3.12.2 97.25% <100.00%> (+<0.01%) ⬆️
Py-3.8.10 95.35% <57.14%> (-0.05%) ⬇️
Py-3.8.18 96.78% <100.00%> (+<0.01%) ⬆️
Py-3.9.13 95.39% <57.14%> (-0.05%) ⬇️
Py-3.9.19 96.90% <100.00%> (-0.01%) ⬇️
Py-pypy7.3.15 96.44% <100.00%> (+<0.01%) ⬆️
VM-macos 96.79% <57.14%> (-0.05%) ⬇️
VM-ubuntu 97.13% <100.00%> (+<0.01%) ⬆️
VM-windows 95.57% <57.14%> (-0.05%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@Dreamsorcerer Dreamsorcerer merged commit ffbc432 into master Apr 11, 2024
37 of 38 checks passed
@Dreamsorcerer Dreamsorcerer deleted the escape-filenames branch April 11, 2024 14:03
Copy link
Contributor

patchback bot commented Apr 11, 2024

Backport to 3.9: 💔 cherry-picking failed — conflicts found

❌ Failed to cleanly apply ffbc432 on top of patchback/backports/3.9/ffbc43233209df302863712b511a11bdb6001b0f/pr-8317

Backporting merged PR #8317 into master

  1. Ensure you have a local repo clone of your fork. Unless you cloned it
    from the upstream, this would be your origin remote.
  2. Make sure you have an upstream repo added as a remote too. In these
    instructions you'll refer to it by the name upstream. If you don't
    have it, here's how you can add it:
    $ git remote add upstream https://github.com/aio-libs/aiohttp.git
  3. Ensure you have the latest copy of upstream and prepare a branch
    that will hold the backported code:
    $ git fetch upstream
    $ git checkout -b patchback/backports/3.9/ffbc43233209df302863712b511a11bdb6001b0f/pr-8317 upstream/3.9
  4. Now, cherry-pick PR Escape filenames and paths in HTML when generating index pages #8317 contents into that branch:
    $ git cherry-pick -x ffbc43233209df302863712b511a11bdb6001b0f
    If it'll yell at you with something like fatal: Commit ffbc43233209df302863712b511a11bdb6001b0f is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x ffbc43233209df302863712b511a11bdb6001b0f
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Escape filenames and paths in HTML when generating index pages #8317 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/3.9/ffbc43233209df302863712b511a11bdb6001b0f/pr-8317
  7. Create a PR, ensure that the CI is green. If it's not — update it so that
    the tests and any other checks pass. This is it!
    Now relax and wait for the maintainers to process your pull request
    when they have some cycles to do reviews. Don't worry — they'll tell you if
    any improvements are necessary when the time comes!

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

Copy link
Contributor

patchback bot commented Apr 11, 2024

Backport to 3.10: 💔 cherry-picking failed — conflicts found

❌ Failed to cleanly apply ffbc432 on top of patchback/backports/3.10/ffbc43233209df302863712b511a11bdb6001b0f/pr-8317

Backporting merged PR #8317 into master

  1. Ensure you have a local repo clone of your fork. Unless you cloned it
    from the upstream, this would be your origin remote.
  2. Make sure you have an upstream repo added as a remote too. In these
    instructions you'll refer to it by the name upstream. If you don't
    have it, here's how you can add it:
    $ git remote add upstream https://github.com/aio-libs/aiohttp.git
  3. Ensure you have the latest copy of upstream and prepare a branch
    that will hold the backported code:
    $ git fetch upstream
    $ git checkout -b patchback/backports/3.10/ffbc43233209df302863712b511a11bdb6001b0f/pr-8317 upstream/3.10
  4. Now, cherry-pick PR Escape filenames and paths in HTML when generating index pages #8317 contents into that branch:
    $ git cherry-pick -x ffbc43233209df302863712b511a11bdb6001b0f
    If it'll yell at you with something like fatal: Commit ffbc43233209df302863712b511a11bdb6001b0f is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x ffbc43233209df302863712b511a11bdb6001b0f
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Escape filenames and paths in HTML when generating index pages #8317 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/3.10/ffbc43233209df302863712b511a11bdb6001b0f/pr-8317
  7. Create a PR, ensure that the CI is green. If it's not — update it so that
    the tests and any other checks pass. This is it!
    Now relax and wait for the maintainers to process your pull request
    when they have some cycles to do reviews. Don't worry — they'll tell you if
    any improvements are necessary when the time comes!

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

Dreamsorcerer added a commit that referenced this pull request Apr 11, 2024
Co-authored-by: J. Nick Koston <[email protected]>
(cherry picked from commit ffbc432)
Dreamsorcerer added a commit that referenced this pull request Apr 11, 2024
Co-authored-by: J. Nick Koston <[email protected]>
(cherry picked from commit ffbc432)
Dreamsorcerer added a commit that referenced this pull request Apr 11, 2024
Dreamsorcerer added a commit that referenced this pull request Apr 11, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-3.10 Trigger automatic backporting to the 3.10 release branch by Patchback robot bot:chronographer:provided There is a change note present in this PR
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants