[draft] Mark all new commits as having no files on clean squash #2163
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
A new Pull Request was created by @iarspider for branch preserve-signatures-on-squash. @iarspider, @cmsbuild, @aandvalenzuela, @smuzaffar can you please review it and eventually sign? Thanks. |
|
cms-bot internal usage |
smuzaffar
reviewed
Jan 31, 2024
| @@ -1517,7 +1517,7 @@ def process_pr(repo_config, gh, repo, issue, dryRun, cmsbuild_user=None, force=F | |||
| missing_commits = set( | |||
| k for k in bot_cache["commits"] if not bot_cache["commits"][k].get("squashed", False) | |||
| ).difference(all_commit_shas) | |||
| last_seen_commit_time = None | |||
smuzaffar
reviewed
Jan 31, 2024
process_pr.py
Outdated
| @@ -1517,7 +1517,7 @@ def process_pr(repo_config, gh, repo, issue, dryRun, cmsbuild_user=None, force=F | |||
| missing_commits = set( | |||
| k for k in bot_cache["commits"] if not bot_cache["commits"][k].get("squashed", False) | |||
| ).difference(all_commit_shas) | |||
| last_seen_commit_time = None | |||
| new_commits = all_commit_shas.difference(k for k in bot_cache["commits"]) | |||
There was a problem hiding this comment.
why not move it under the condition when there are no differences between last seen and new commits i.e under https://github.com/cms-sw/cms-bot/pull/2144/files#diff-f37d46a488510bd0b96fd201ff189f8a704b756502df6a1cd46b117986e608a4R1550 ?
smuzaffar
reviewed
Jan 31, 2024
process_pr.py
Outdated
| last_seen_commit_time | ||
| and commit.commit.committer.date.timestamp() > last_seen_commit_time | ||
| ): | ||
| if last_seen_commit_time is not None and commit.sha in new_commits: |
There was a problem hiding this comment.
once calculation of new_commits is moved at the right place then no need to check for last_seen_commit_time is not None (just commit.sha in new_commits should be enough)
|
Pull request #2163 was updated. |
|
looks good |
smuzaffar
added a commit
that referenced
this pull request
Feb 5, 2024
* Detect commit squashing and preserve signatures * Remove wrapper function for getting reactions * Cleanup * Do not remove squashed commits, inject them after looping over existing commits * [WIP] Fix errors after rebasing * Fix logic * Restore pre-checks * Add detection of back-dated commits * Do not warn about back-dated commits in new PRs * Revert accidental change * Changes from review * Fix from review * Use different way of detecting back-dated commits * Use last-seen-commit sha * Changes from review * Let bot re-do code-checks and tests on clean squash * Do not overwrite signed_commit_sha * Changes from review * Fix for missing dictionary key * Move commits under dedicated key in bot_cache * Sign any commit * Fix logic for populating bot_cache * Fix collect_commit_cache * Change logic to detect squashes * Further simplify squash detection * Improve logic restricting the commit count limit; make all new commits contain no files if there was a clean squash * Only set last_seen_commit_time if the squash was clean * Improve limit-checking further * Move check for commit-limit message * Change timestamp of new commits to one of last commit seen if clean squash is detected * Remove unnecessary line * Changes from review * Change from review * [draft] Mark all new commits as having no files on clean squash (#2163) * [draft] Mark all new commits as having no files on clean squash * Changes from review * Fix injection of squashed commits * bug fixes; comment id string ; correct key for bot_cache * formatting * use signed event to trigger test * formatting * improve auto test start on sign * handle the case where a squashed commit is added back * reset squashed only for added back commits * save last seen sha in bot cache * use file checksum instead of patch for comparing --------- Co-authored-by: Malik Shahzad Muzaffar <shahzad.malik.muzaffar@cern.ch>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
To be tested