Skip to content

[14.0] Add storage of context in jobs recordsets - #433

Merged
OCA-git-bot merged 2 commits into
OCA:14.0from
AshishHirapara:14.0-queue_job-store_context
May 30, 2022
Merged

[14.0] Add storage of context in jobs recordsets#433
OCA-git-bot merged 2 commits into
OCA:14.0from
AshishHirapara:14.0-queue_job-store_context

Conversation

@AshishHirapara

@AshishHiraparaAshishHirapara commented May 24, 2022•
edited
Loading

Copy link
Copy Markdown

This is the migration of the PR #432 (by @guewen) to 14.0

@OCA-git-bot

OCA-git-bot commented May 24, 2022

Copy link
Copy Markdown
Contributor

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

guewen
guewen approved these changes May 24, 2022
View reviewed changes

@guewenguewen 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.

Thank you!

@AshishHirapara
AshishHiraparaforce-pushed the 14.0-queue_job-store_context branch from da98d0c to c14276dCompareMay 24, 2022 13:15
@AshishHiraparaAshishHirapara mentioned this pull request May 24, 2022
Merged
GSLabIt
GSLabIt approved these changes May 24, 2022
View reviewed changes

@GSLabItGSLabIt left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

LGTM

simahawk
simahawk requested changes May 24, 2022
View reviewed changes

@simahawksimahawk left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

wait, commits are not the same. How are you picking the changes?

@AshishHirapara

AshishHirapara commented May 25, 2022

Copy link
Copy Markdown
Author

@simahawk what do you mean by commits are not the same? Please elaborate more.

@simahawk

simahawk commented May 25, 2022•
edited
Loading

Copy link
Copy Markdown
Contributor

The way to port changes from versions to versions is to use cherry-pick or to use format-patch (see https://github.com/OCA/maintainer-tools/wiki/Migration-to-version-14.0).
Here you are creating completely new commits which lose the original author and make back/forward porting harder because the message is different (and it will be harder to detect which commits to port).

Easy option:

  1. switch to your branch
  2. git reset --hard on OCA/14.0
  3. git log -10 OCA/13.0 (adjust the number to find the commits)
  4. git cherry-pick $commit1
  5. git cherry-pick $commit2

@AshishHirapara

AshishHirapara commented May 25, 2022

Copy link
Copy Markdown
Author

@simahawk got it, I will update it soon.

@simahawk

simahawk commented May 26, 2022

Copy link
Copy Markdown
Contributor

as you prefer

@AshishHirapara
AshishHiraparaforce-pushed the 14.0-queue_job-store_context branch from c14276d to 4d1e8faCompareMay 30, 2022 11:55
@OCA-git-bot

OCA-git-bot commented May 30, 2022

Copy link
Copy Markdown
Contributor

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

@AshishHirapara
AshishHiraparaforce-pushed the 14.0-queue_job-store_context branch from 21d8945 to effc5c7CompareMay 30, 2022 12:07
@AshishHiraparaAshishHirapara changed the title [14.0][UPD] queue_job: migration of PR#432[14.0] Add storage of context in jobs recordsetsMay 30, 2022
@AshishHirapara
AshishHiraparaforce-pushed the 14.0-queue_job-store_context branch 4 times, most recently from 4e3250d to 9691634CompareMay 30, 2022 13:09
simahawk
simahawk reviewed May 30, 2022
View reviewed changes
Comment threadqueue_job/models/base.py Outdated
@guewen@AshishHirapara
Disable storing of context in jobs recordsets by default
8f1f9de
It can still be activated by overriding a method.
@AshishHirapara
AshishHiraparaforce-pushed the 14.0-queue_job-store_context branch from f1cfab2 to 8f1f9deCompareMay 30, 2022 13:31
simahawk
simahawk approved these changes May 30, 2022
View reviewed changes

@simahawksimahawk left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LG

@simahawk

simahawk commented May 30, 2022

Copy link
Copy Markdown
Contributor

/ocabot merge minor

@OCA-git-bot

OCA-git-bot commented May 30, 2022

Copy link
Copy Markdown
Contributor

What a great day to merge this nice PR. Let's do it!
Prepared branch 14.0-ocabot-merge-pr-433-by-simahawk-bump-minor, awaiting test results.

@OCA-git-bot
OCA-git-bot merged commit e5fb2c0 into OCA:14.0May 30, 2022
@OCA-git-bot

OCA-git-bot commented May 30, 2022

Copy link
Copy Markdown
Contributor

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

@hoangtrannhoangtrann mentioned this pull request Oct 18, 2022
Merged
@sbidoulsbidoul mentioned this pull request Oct 20, 2022
Merged
@baimontbaimont mentioned this pull request Oct 20, 2022
Merged
This was referenced Feb 28, 2023
Closed
Merged
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@simahawksimahawksimahawk approved these changes
@guewenguewenguewen approved these changes
+1 more reviewer
@GSLabItGSLabItGSLabIt approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

approvedmerged 🎉

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@AshishHirapara@OCA-git-bot@simahawk@guewen@GSLabIt