Conversation
Signed-off-by: jingfelix <jingfelix@outlook.com>
Signed-off-by: jingfelix <jingfelix@outlook.com>
24bc914 to
7e1e3be
Compare
Signed-off-by: jingfelix <jingfelix@outlook.com>
Signed-off-by: jingfelix <jingfelix@outlook.com>
to avoid unexpected `git clean` in other dirs Signed-off-by: jingfelix <jingfelix@outlook.com>
978e284 to
207d5b4
Compare
Signed-off-by: jingfelix <jingfelix@outlook.com>
Signed-off-by: jingfelix <jingfelix@outlook.com>
Signed-off-by: jingfelix <jingfelix@outlook.com>
Signed-off-by: jingfelix <jingfelix@outlook.com>
Signed-off-by: jingfelix <jingfelix@outlook.com>
Signed-off-by: jingfelix <jingfelix@outlook.com>
Signed-off-by: jingfelix <jingfelix@outlook.com>
Signed-off-by: jingfelix <jingfelix@outlook.com>
Signed-off-by: jingfelix <jingfelix@outlook.com>
dea0131 to
b0f437f
Compare
Signed-off-by: jingfelix <jingfelix@outlook.com>
b0f437f to
588d144
Compare
Signed-off-by: jingfelix <jingfelix@outlook.com>
e2fcf56 to
95399f7
Compare
Signed-off-by: jingfelix <jingfelix@outlook.com>
Signed-off-by: jingfelix <jingfelix@outlook.com>
Signed-off-by: jingfelix <jingfelix@outlook.com>
Signed-off-by: jingfelix <jingfelix@outlook.com>
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.
Note
Following description is generated by Copilot
This pull request introduces several enhancements and updates across multiple files to improve functionality and fix issues related to symbol extraction and JSON configuration handling. The most important changes include updates to the
autocommand, the addition of new functions for symbol extraction, and modifications to theapply_changeandtracefunctions.Enhancements to
autocommand:src/ppatch/commands/auto.py: Added support for an extra configuration file (extra_config) to extract and use symbols during the auto command execution. [1] [2]New functions for symbol extraction:
src/ppatch/commands/symbol.py: Added thegetsymbol_from_patchfunction to extract symbols from a patch file and return the corresponding hunk numbers.Modifications to
apply_changefunction:src/ppatch/utils/resolve.py: Updated theapply_changefunction to include symbol searching within conflict hunks and merge extra hunks into the conflict hunk list. [1] [2]JSON configuration handling:
scripts/json_to_config.py: Added a new script to extract data from a JSON file and generate filtered and merged configurations for symbol extraction.Same as GNU Patch
src/ppatch/utils/resolve.pycan now handle apply and reverse just the same as GNU Patch do.Trace Symbol in multiple files
src/ppatch/commands/trace.pycan now trace symbol in more than one targe file.Dependency updates:
pyproject.toml: Updated thecscopydependency version from0.0.1to0.0.3.