-
-
Notifications
You must be signed in to change notification settings - Fork 492
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
Add info logs to make transaction of working copy merge more traceable #8178
Merged
ianwallen
merged 11 commits into
geonetwork:main
from
wangf1122:main.improve.logging.workingcopy.merge
Jun 25, 2024
Merged
Add info logs to make transaction of working copy merge more traceable #8178
ianwallen
merged 11 commits into
geonetwork:main
from
wangf1122:main.improve.logging.workingcopy.merge
Jun 25, 2024
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
josegar74
reviewed
Jun 19, 2024
listeners/src/main/java/org/fao/geonet/listener/metadata/draft/DraftUtilities.java
Outdated
Show resolved
Hide resolved
listeners/src/main/java/org/fao/geonet/listener/metadata/draft/DraftUtilities.java
Outdated
Show resolved
Hide resolved
datastorages/cmis/src/main/java/org/fao/geonet/api/records/attachments/CMISStore.java
Outdated
Show resolved
Hide resolved
datastorages/cmis/src/main/java/org/fao/geonet/api/records/attachments/CMISStore.java
Outdated
Show resolved
Hide resolved
…/DraftUtilities.java Co-authored-by: Jose García <[email protected]>
…/DraftUtilities.java Co-authored-by: Jose García <[email protected]>
…achments/CMISStore.java Co-authored-by: Jose García <[email protected]>
…achments/CMISStore.java Co-authored-by: Jose García <[email protected]>
ianwallen
reviewed
Jun 20, 2024
datastorages/cmis/src/main/java/org/fao/geonet/api/records/attachments/CMISStore.java
Show resolved
Hide resolved
josegar74
approved these changes
Jun 25, 2024
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks fine, please check the change suggestion.
core/src/main/java/org/fao/geonet/api/records/attachments/FilesystemStore.java
Outdated
Show resolved
Hide resolved
…systemStore.java Co-authored-by: Jose García <[email protected]>
The backport to
stderr
stdout
To backport manually, run these commands in your terminal: # Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-4.2.x 4.2.x
# Navigate to the new working tree
cd .worktrees/backport-4.2.x
# Create a new branch
git switch --create backport-8178-to-4.2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick d1fa3e68fa8f9b2360b67e62c8eb52497e7c3929,407bb2dacebb6b64f3347b926cfd5af6e4ccad49,205dd17ff02660be88a43298d7a80c271900d8bc,b71f369d2c51421a54591075e5dcbd00e513c4fc,7929f48dc61575c64bd379fda3bd2c7dd820f6c7,4cd72dc3a9d883a4e1cdb74b184b78ef3f786aaa,82868ffeeecda47c788d17a3049d46689eabbccd,2952fb3a0bfd6dd6f98fc8cc0547e11a38a0d1c8,e904d4f7dad7608167d553d607b3d081bdf6c267,24d865bdfb3c32db3bbfc5d5b1d6c3660dd1a056,6d11d5d99874f791c065f221069c27690130c350
# Push it to GitHub
git push --set-upstream origin backport-8178-to-4.2.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-4.2.x Then, create a pull request where the |
ianwallen
added a commit
that referenced
this pull request
Jun 25, 2024
#8178) * Add info logs to make transaction of working copy merge more traceable * build fix * Update listeners/src/main/java/org/fao/geonet/listener/metadata/draft/DraftUtilities.java Co-authored-by: Jose García <[email protected]> * Update listeners/src/main/java/org/fao/geonet/listener/metadata/draft/DraftUtilities.java Co-authored-by: Jose García <[email protected]> * Update datastorages/cmis/src/main/java/org/fao/geonet/api/records/attachments/CMISStore.java Co-authored-by: Jose García <[email protected]> * Update datastorages/cmis/src/main/java/org/fao/geonet/api/records/attachments/CMISStore.java Co-authored-by: Jose García <[email protected]> * add more logs for delete folder * build fix * build fix * Update core/src/main/java/org/fao/geonet/api/records/attachments/FilesystemStore.java Co-authored-by: Jose García <[email protected]> --------- Co-authored-by: Jose García <[email protected]> Co-authored-by: Ian <[email protected]>
ianwallen
added a commit
that referenced
this pull request
Jun 25, 2024
#8178) (#8218) * Add info logs to make transaction of working copy merge more traceable * build fix * Update listeners/src/main/java/org/fao/geonet/listener/metadata/draft/DraftUtilities.java * Update listeners/src/main/java/org/fao/geonet/listener/metadata/draft/DraftUtilities.java * Update datastorages/cmis/src/main/java/org/fao/geonet/api/records/attachments/CMISStore.java * Update datastorages/cmis/src/main/java/org/fao/geonet/api/records/attachments/CMISStore.java * add more logs for delete folder * build fix * build fix * Update core/src/main/java/org/fao/geonet/api/records/attachments/FilesystemStore.java --------- Co-authored-by: wangf1122 <[email protected]> Co-authored-by: Jose García <[email protected]>
josegar74
added a commit
to GeoCat/core-geonetwork
that referenced
this pull request
Jun 27, 2024
geonetwork#8178) * Add info logs to make transaction of working copy merge more traceable * build fix * Update listeners/src/main/java/org/fao/geonet/listener/metadata/draft/DraftUtilities.java Co-authored-by: Jose García <[email protected]> * Update listeners/src/main/java/org/fao/geonet/listener/metadata/draft/DraftUtilities.java Co-authored-by: Jose García <[email protected]> * Update datastorages/cmis/src/main/java/org/fao/geonet/api/records/attachments/CMISStore.java Co-authored-by: Jose García <[email protected]> * Update datastorages/cmis/src/main/java/org/fao/geonet/api/records/attachments/CMISStore.java Co-authored-by: Jose García <[email protected]> * add more logs for delete folder * build fix * build fix * Update core/src/main/java/org/fao/geonet/api/records/attachments/FilesystemStore.java Co-authored-by: Jose García <[email protected]> --------- Co-authored-by: Jose García <[email protected]> Co-authored-by: Ian <[email protected]>
fxprunayre
pushed a commit
to SPW-DIG/metawal-core-geonetwork
that referenced
this pull request
Jul 18, 2024
geonetwork#8178) * Add info logs to make transaction of working copy merge more traceable * build fix * Update listeners/src/main/java/org/fao/geonet/listener/metadata/draft/DraftUtilities.java Co-authored-by: Jose García <[email protected]> * Update listeners/src/main/java/org/fao/geonet/listener/metadata/draft/DraftUtilities.java Co-authored-by: Jose García <[email protected]> * Update datastorages/cmis/src/main/java/org/fao/geonet/api/records/attachments/CMISStore.java Co-authored-by: Jose García <[email protected]> * Update datastorages/cmis/src/main/java/org/fao/geonet/api/records/attachments/CMISStore.java Co-authored-by: Jose García <[email protected]> * add more logs for delete folder * build fix * build fix * Update core/src/main/java/org/fao/geonet/api/records/attachments/FilesystemStore.java Co-authored-by: Jose García <[email protected]> --------- Co-authored-by: Jose García <[email protected]> Co-authored-by: Ian <[email protected]>
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.
As to improve the traceability of issue #7952. More info log is added to make the file copy and resource folder deleting more transparent. So the developer and system admin will have better vision.