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

Split diff by block type #22830

Merged
merged 5 commits into from
Nov 12, 2024
Merged

Split diff by block type #22830

merged 5 commits into from
Nov 12, 2024

Conversation

KevinMind
Copy link
Contributor

@KevinMind KevinMind commented Nov 7, 2024

Relates to: #22826
Relates to: #22828
Fixes: mozilla/addons#15147

Description

Split generate_diffs to include diffs for both hard and soft blocks. This is required for both stashing and filter updates.

Context

This patch is required by both of the linked PRs and to keep them independent we should land this (trivial) change first and rebase the other two.

Testing

This is a backaward compatible patch so automated testing is fine.

Checklist

  • Add #ISSUENUM at the top of your PR to an existing open issue in the mozilla/addons repository.
  • Successfully verified the change locally.
  • The change is covered by automated tests, or otherwise indicated why doing so is unnecessary/impossible.
  • Add before and after screenshots (Only for changes that impact the UI).
  • Add or update relevant docs reflecting the changes made.

Copy link
Member

@willdurand willdurand left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is looking promising. I have some comments.

src/olympia/blocklist/tests/test_mlbf.py Outdated Show resolved Hide resolved
src/olympia/blocklist/mlbf.py Outdated Show resolved Hide resolved
src/olympia/blocklist/mlbf.py Show resolved Hide resolved
src/olympia/blocklist/mlbf.py Show resolved Hide resolved
src/olympia/blocklist/tests/test_mlbf.py Outdated Show resolved Hide resolved
src/olympia/blocklist/tests/test_mlbf.py Show resolved Hide resolved
src/olympia/blocklist/tests/test_mlbf.py Outdated Show resolved Hide resolved
Copy link
Member

@willdurand willdurand left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

r+wc, thanks

@KevinMind KevinMind merged commit 5846124 into master Nov 12, 2024
33 checks passed
@KevinMind KevinMind deleted the mlbf-split-diff branch November 12, 2024 09:44
@willdurand willdurand removed the request for review from eviljeff November 12, 2024 10:13
@KevinMind KevinMind added this to the 2024.11.14 milestone Nov 12, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Bug]: Order of the entries in the cache.json file should be stable
3 participants