Adding recursive parsing to flatten command#158
Closed
ptrpfn wants to merge 9 commits intoascmitc:masterfrom
Closed
Adding recursive parsing to flatten command#158ptrpfn wants to merge 9 commits intoascmitc:masterfrom
ptrpfn wants to merge 9 commits intoascmitc:masterfrom
Conversation
There was a problem hiding this comment.
Pull Request Overview
This pull request extends the flatten command functionality by recursively flattening child histories in addition to the root history.
- Added a new test (test_nested) for validating recursive flattening.
- Updated generator and commands modules to support child history processing and handle file movements.
- Introduced a helper function (flatten_child_histories) and modified the commit logic to accommodate flattened manifests.
Reviewed Changes
Copilot reviewed 3 out of 3 changed files in this pull request and generated 3 comments.
| File | Description |
|---|---|
| tests/test_flatten.py | Added a new test to verify nested history flattening. |
| ascmhl/generator.py | Updated commit flow and logging for original hash creation and flattened manifest handling. |
| ascmhl/commands.py | Introduced recursive handling via flatten_child_histories and updated flatten_history accordingly. |
Comments suppressed due to low confidence (1)
tests/test_flatten.py:67
- [nitpick] Consider verifying key output components or using substring assertions instead of an exact string match; this can make the test more robust to minor formatting changes.
assert ( result.output == f"Flattening folder at path: {abspath_conversion_tests('/root')} ...\n" ... )
| if original_hash_entry is None: | ||
| hash_entry.action = "original" | ||
| logger.verbose(f" created original hash for {relative_path} {hash_format}: {hash_string}") | ||
| if relative_path != None: |
There was a problem hiding this comment.
Prefer using 'is not None' instead of '!= None' for clarity and to align with Python best practices.
Suggested change
| if relative_path != None: | |
| if relative_path is not None: |
| # ... or flattened history manifest | ||
| root_path = os.path.dirname(new_hash_list.file_path) | ||
| if not os.path.exists(root_path): | ||
| print(f"ERR: folder {root_path} with flattened manifest does not exist") |
There was a problem hiding this comment.
Consider using a logging method (e.g., logger.error) instead of print for error handling to maintain consistency in the logging approach.
Suggested change
| print(f"ERR: folder {root_path} with flattened manifest does not exist") | |
| logger.error(f"Folder {root_path} with flattened manifest does not exist") |
Comment on lines
+1249
to
+1250
|
|
||
| # if os.path.isabs(file_path): |
There was a problem hiding this comment.
[nitpick] Remove unused commented out code to improve clarity and maintainability.
Suggested change
| # if os.path.isabs(file_path): |
Collaborator
|
covered by pull request #166 |
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.
The
flattencommand only flattened the root history, but not child histories. Including the hashes from the child histories was missing in the implementation and is added with this pull request.