feat: improve patch extension with new file content comparison

[mrT23]

PR Type

Enhancement, Tests

---

Description

• Enhanced extend_patch to support new file content comparison.

• Improved dynamic context handling for patch extension.

• Updated test cases to validate new functionality.

• Added optional parameter for trailing character removal in patch extraction.

---

Changes walkthrough 📝

	Relevant files
Enhancement	git_patch_processing.py Enhanced patch extension with new file comparison                pr_agent/algo/git_patch_processing.py Added new_file_str parameter for new file content comparison. Enhanced dynamic context handling with original and new file checks. Improved logging for mismatched lines and encoding issues. Refactored methods to support new functionality. +66/-31  pr_processing.py Updated PR processing for extended patch handling                pr_agent/algo/pr_processing.py Integrated new_file_str into patch extension logic. Added optional line number inclusion in multi-diff generation. Enhanced metadata handling for patches. +14/-5    config_loader.py Enhanced settings retrieval with context option                    pr_agent/config_loader.py Added use_context parameter to get_settings. +1/-1
Tests	test_extend_patch.py Extended tests for patch extension enhancements                    tests/unittest/test_extend_patch.py Updated tests to validate new_file_str functionality. Added dynamic context and trailing character removal test cases. Refactored test setup for better configuration handling. +22/-18

---

Need help?

Type /help how to ... in the comments thread for any questions about Qodo Merge usage.

Check out the documentation for more information.

[qodo-merge-pro-for-open-source]

PR Reviewer Guide 🔍

Here are some key observations to aid the review process:

⏱️ Estimated effort to review: 3 🔵🔵🔵⚪⚪

🧪 PR contains tests

🔒 No security concerns identified

⚡ Recommended focus areas for review Encoding Fallback The code attempts multiple encodings when there's a mismatch, but continues processing even if all encoding attempts fail. This could lead to incorrect patch extensions. original_line = original_lines[start1 - 1].strip() for encoding in ['iso-8859-1', 'latin-1', 'ascii', 'utf-16']: try: if original_line.encode(encoding).decode().strip() == patch_lines[i + 1].strip(): get_logger().info(f"Detected different encoding in hunk header line {start1}, needed encoding: {encoding}") return False # we still want to avoid extending the hunk. But we don't want to log an error except: pass Error Handling The function silently catches all exceptions in the encoding conversion attempts without proper error logging or handling. except: pass

[qodo-merge-pro-for-open-source]

PR Code Suggestions ✨

Category	Suggestion	Impact
Possible issue	Validate required dynamic context data Add validation to ensure that new_file_str is not empty when allow_dynamic_context is True, as the dynamic context comparison relies on having both original and new file content. pr_agent/algo/git_patch_processing.py [98-100] -if allow_dynamic_context and file_new_lines: - extended_start1, extended_size1, extended_start2, extended_size2 = \ - _calc_context_limits(patch_extra_lines_before_dynamic) +if allow_dynamic_context: + if not file_new_lines: + get_logger().debug("Dynamic context requires new file content - falling back to standard context") + extended_start1, extended_size1, extended_start2, extended_size2 = \ + _calc_context_limits(patch_extra_lines_before) + else: + extended_start1, extended_size1, extended_start2, extended_size2 = \ + _calc_context_limits(patch_extra_lines_before_dynamic) Apply this suggestion Suggestion importance[1-10]: 7 __ Why: The suggestion improves error handling by gracefully falling back to standard context when dynamic context requirements aren't met, preventing potential issues with missing data.	Medium
Learned best practice	Add null safety checks when handling potentially None string inputs to prevent runtime errors The new code handling file content comparison should include null safety checks for new_file_str before accessing it. While there's a check for file_new_lines, the initial string should be validated before splitting into lines. pr_agent/algo/git_patch_processing.py [17] -new_file_str = decode_if_bytes(new_file_str) +new_file_str = decode_if_bytes(new_file_str or "") file_new_lines = new_file_str.splitlines() if new_file_str else [] [To ensure code accuracy, apply this suggestion manually] Suggestion importance[1-10]: 6	Low
More

• Author self-review: I have reviewed the PR code suggestions, and addressed the relevant ones.

[mrT23]

/improve

[qodo-merge-pro-for-open-source]

PR Code Suggestions ✨

Category	Suggestion	Impact
Possible issue	Validate required dynamic context data Add validation to ensure that new_file_str is not empty when allow_dynamic_context is True, as the dynamic context comparison relies on having both original and new file content. pr_agent/algo/git_patch_processing.py [98-100] -if allow_dynamic_context and file_new_lines: - extended_start1, extended_size1, extended_start2, extended_size2 = \ - _calc_context_limits(patch_extra_lines_before_dynamic) +if allow_dynamic_context: + if not file_new_lines: + get_logger().debug("Dynamic context requires new file content - falling back to standard context") + extended_start1, extended_size1, extended_start2, extended_size2 = \ + _calc_context_limits(patch_extra_lines_before) + else: + extended_start1, extended_size1, extended_start2, extended_size2 = \ + _calc_context_limits(patch_extra_lines_before_dynamic) Apply this suggestion Suggestion importance[1-10]: 7 __ Why: The suggestion improves error handling by gracefully falling back to standard context when dynamic context requirements aren't met, preventing potential issues with missing data.	Medium
Learned best practice	Add null safety checks when handling potentially None string inputs to prevent runtime errors The new code handling file content comparison should include null safety checks for new_file_str before accessing it. While there's a check for file_new_lines, the initial string should be validated before splitting into lines. pr_agent/algo/git_patch_processing.py [17] -new_file_str = decode_if_bytes(new_file_str) +new_file_str = decode_if_bytes(new_file_str or "") file_new_lines = new_file_str.splitlines() if new_file_str else [] [To ensure code accuracy, apply this suggestion manually] Suggestion importance[1-10]: 6	Low
More

• Author self-review: I have reviewed the PR code suggestions, and addressed the relevant ones.