Skip to content

Next symbol#6

Merged
jingfelix merged 20 commits intomainfrom
next-symbol
Feb 26, 2025
Merged

Next symbol#6
jingfelix merged 20 commits intomainfrom
next-symbol

Conversation

@jingfelix
Copy link
Copy Markdown
Member

@jingfelix jingfelix commented Oct 15, 2024

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 auto command, the addition of new functions for symbol extraction, and modifications to the apply_change and trace functions.

Enhancements to auto command:

New functions for symbol extraction:

  • src/ppatch/commands/symbol.py: Added the getsymbol_from_patch function to extract symbols from a patch file and return the corresponding hunk numbers.

Modifications to apply_change function:

  • src/ppatch/utils/resolve.py: Updated the apply_change function 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.py can now handle apply and reverse just the same as GNU Patch do.

Trace Symbol in multiple files

  • src/ppatch/commands/trace.py can now trace symbol in more than one targe file.

Dependency updates:

  • pyproject.toml: Updated the cscopy dependency version from 0.0.1 to 0.0.3.

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>
to avoid unexpected `git clean` in other dirs

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>
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>
@jingfelix jingfelix requested a review from Copilot February 26, 2025 06:49
Copy link
Copy Markdown

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copilot reviewed 16 out of 16 changed files in this pull request and generated 2 comments.

Comment thread src/ppatch/commands/trace.py Outdated
Comment thread src/ppatch/utils/common.py
Signed-off-by: jingfelix <jingfelix@outlook.com>
@jingfelix jingfelix merged commit d81e997 into main Feb 26, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants