ENH: organize - show files with conflicts requiring adding _obj-#1490
Draft
yarikoptic wants to merge 3 commits intomasterfrom
Draft
ENH: organize - show files with conflicts requiring adding _obj-#1490yarikoptic wants to merge 3 commits intomasterfrom
yarikoptic wants to merge 3 commits intomasterfrom
Conversation
yarikoptic
commented
Aug 20, 2024
Logging check is currently not really functioning since IIRC we do enable logging into a file at higher level than INFO. So we might need to tune decision making here
21fd7fa to
c45ffe2
Compare
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## master #1490 +/- ##
==========================================
+ Coverage 88.55% 88.60% +0.04%
==========================================
Files 77 77
Lines 10568 10581 +13
==========================================
+ Hits 9359 9375 +16
+ Misses 1209 1206 -3
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
jwodder
suggested changes
Aug 20, 2024
Co-authored-by: John T. Wodder II <[email protected]>
…s at DEBUG
With this change logging looks like
2024-08-21 09:42:39,718 [ INFO] 2 out of 5 paths are not unique.
2 paths 'compete' for the path 'sub-P53CS/sub-P53CS_ses-20171101_ecephys+image.nwb':
/home/yoh/proj/dandi/dandisets/000004/sub-P53CS/sub-P53CS_ses-20171101_obj-108aqix_ecephys+image.nwb
/home/yoh/proj/dandi/dandisets/000004/sub-P53CS/sub-P53CS_ses-20171101_obj-lj04dr_ecephys+image.nwb
1 more case(s) are listed at DEBUG level.
2024-08-21 09:42:39,718 [ DEBUG] Additional non-unique paths:
3 paths 'compete' for the path 'sub-P54CS/sub-P54CS_ses-20180101_ecephys+image.nwb':
/home/yoh/proj/dandi/dandisets/000004/sub-P54CS/sub-P54CS_ses-20180101_obj-1ru98u8_ecephys+image.nwb
/home/yoh/proj/dandi/dandisets/000004/sub-P54CS/sub-P54CS_ses-20180101_obj-1ukzk61_ecephys+image.nwb
/home/yoh/proj/dandi/dandisets/000004/sub-P54CS/sub-P54CS_ses-20180101_obj-1vx1a5w_ecephys+image.nwb
2024-08-21 09:42:39,718 [ INFO] We will try adding _obj- based on crc32 of object_id
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
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.
Logging check is currently not really functioning since IIRC we do enable logging into a file at higher level than INFO. So we might need to tune decision making here
Should provide UX side to partially address:
example:
TODOs
_obj