Skip to content

[16.0][FIX] mail_composer_cc_bcc: adapt to changes upstream#1519

Merged
OCA-git-bot merged 3 commits into
OCA:16.0from
hbrunn:16.0-mail_composer_cc_bcc-fix-upstream-2024-12-12
Dec 16, 2024
Merged

[16.0][FIX] mail_composer_cc_bcc: adapt to changes upstream#1519
OCA-git-bot merged 3 commits into
OCA:16.0from
hbrunn:16.0-mail_composer_cc_bcc-fix-upstream-2024-12-12

Conversation

@hbrunn

@hbrunn hbrunn commented Dec 12, 2024

Copy link
Copy Markdown
Member

that's a nifty way to detect upstream changes and force adapting to it.

I wonder however if we couldn't achieve the same goal without copying so much code by setting some context keys that are picked up in an override of ir.mail.server#build_email

@OCA-git-bot

Copy link
Copy Markdown
Contributor

Hi @hailangvn2023,
some modules you are maintaining are being modified, check this out!

@nilshamerlinck

nilshamerlinck commented Dec 13, 2024

Copy link
Copy Markdown

hi @hbrunn

@trisdoan

Copy link
Copy Markdown
Contributor

Hello @hbrunn, I just opened a PR: hbrunn#4 to add another changes from upstream, would you mind taking a look?

@hbrunn

hbrunn commented Dec 16, 2024

Copy link
Copy Markdown
Member Author

@trisdoan thanks, merged

@yajo

yajo commented Dec 16, 2024

Copy link
Copy Markdown
Member

Both the previous error message and the new changes are a bit cryptic... could you please explain what was happening?

emiliesoutiras added a commit to Groupe-Voltaire-SAS/social that referenced this pull request Dec 16, 2024
@hbrunn

hbrunn commented Dec 16, 2024

Copy link
Copy Markdown
Member Author

@yajo they created a test that compares the hash of the source code of a function they override with a list of known hashes, so as soon as this changes in upstream, the test fails and we know we have to check if we need to incorporate any changes from there.

Added an error message to this effect in f2e9624

@yajo

yajo commented Dec 16, 2024

Copy link
Copy Markdown
Member

Ah wow! That was very non-obvious. Thanks.

Would you mind to squash it and put that explanation in the commit message itself? I think it'll be valuable some day when it happens again and we git blame over it.

Apart from that, the change LGTM.

This is a test that compares the hash of the source code of a function they
override with a list of known hashes, so as soon as this changes in upstream,
the test fails and we know we have to check if we need to incorporate any changes
from there.
@hbrunn hbrunn force-pushed the 16.0-mail_composer_cc_bcc-fix-upstream-2024-12-12 branch from f2e9624 to 35e89eb Compare December 16, 2024 10:43
@hbrunn

hbrunn commented Dec 16, 2024

Copy link
Copy Markdown
Member Author

added the commit message. But what do you want me to squash here? Seems like three logically independent changes to me

@yajo yajo left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

If the commits said something like "adapt to changes upstream. Changes in odoo/odoo#123123 made the hash change", their messages would be more valuable.

If a single commit contained all those explanation, that'd be equally good to me.

But in any case, it's OK if you don't prefer to squash. At this point it's good enough to me. 😄

Thank you very much!

/ocabot merge patch

@OCA-git-bot

Copy link
Copy Markdown
Contributor

This PR looks fantastic, let's merge it!
Prepared branch 16.0-ocabot-merge-pr-1519-by-yajo-bump-patch, awaiting test results.

@OCA-git-bot OCA-git-bot merged commit 0678011 into OCA:16.0 Dec 16, 2024
@OCA-git-bot

Copy link
Copy Markdown
Contributor

Congratulations, your PR was merged at 695fc48. Thanks a lot for contributing to OCA. ❤️

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants