repo_synchroniser: avoid non fast-forward and nothing changed issues (bug 1965991) #49
Conversation
This file contains hidden or 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
…d issues when reprocessing old messages
shtrom
commented
May 9, 2025
| try: | ||
| repo = self.get_clone_repo() | ||
| except PermissionError as exc: | ||
| except PermissionError as e: |
Member
Author
There was a problem hiding this comment.
We have a from git import Repo, exc above, which I'd rather not shadow.
shtrom
changed the title
shtrom
changed the title
…-forward issues when reprocessing old messages
…on fast-forward issues when reprocessing old messages
cgsheeh
requested changes
May 13, 2025
…avoid non fast-forward issues when reprocessing old messages
zzzeid
approved these changes
May 27, 2025
Comment on lines
+233
to
+247
| # XXX: In the current state, cinnabar refuses to re-create a tag which already | ||
| # exists anywhere in its working state. This means we can't duplicate an existing tag to a | ||
| # different destination. This is probably sane, as we should instead have a more | ||
| # controlled way of graduating tags to repos (e.g., to m-c). | ||
| # | ||
| # Leaving this here for later reference (and to support the discussion above). | ||
| # | ||
| # assert "BAR CONTENT" in hg_cat(hg_destination_other, "bar.txt", tag) | ||
| # | ||
| # test tag commit message | ||
| # tag_log = hg_log(hg_destination_other, tag_branch, ["-T", "{desc}"]) | ||
| # assert "No bug - Tagging" in tag_log | ||
| # assert tag_suffix in tag_log | ||
| # assert tag in tag_log | ||
| # assert hg_rev(hg_destination_other, branch) in tag_log |
Contributor
There was a problem hiding this comment.
Not sure we need to keep commented out code, can always go back and re-add it when needed since it's still in the commit history.
Co-authored-by: Zeid <2043828+zzzeid@users.noreply.github.com>
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.
This may happen when reprocessing old messages.
This PR is currently a WIP, as we are reaching the limits of what we can reasonably do on the user-side of cinnabar.
Waiting for a
git cinnabar pushcommand to do most of the checks attempted here.