Add more tests for patching by spoorcc · Pull Request #987 · dfetch-org/dfetch · GitHub

Summary by CodeRabbit

New Features
- Patches now apply successfully with fuzzy matching when upstream includes minor changes, even if context lines shift or are modified.
Tests
- Added test scenarios for fuzzy patch application behavior and enhanced patch testing infrastructure to support operations across directories.

Warning

Rate limit exceeded

@spoorcc has exceeded the limit for the number of commits that can be reviewed per hour. Please wait 1 minutes and 36 seconds before requesting another review.

⌛ How to resolve this issue?

After the wait time has elapsed, a review can be triggered using the @coderabbitai review command as a PR comment. Alternatively, push new commits to this PR.

We recommend that you space out your commits to avoid hitting the rate limit.

🚦 How do rate limits work?

CodeRabbit enforces hourly rate limits for each developer per organization.

Our paid plans have higher rate limits than the trial, open-source and free plans. In all cases, we re-allow further reviews after a brief timeout.

Please see our FAQ for further information.

Walkthrough

This PR adds a new BDD feature for patch fuzzy matching and enhances test infrastructure. It includes documentation updates to reference patch scenarios, a new feature test file for fuzzy patch matching, and new step definitions supporting directory-aware patch file creation and remote repository modifications.

Changes

Cohort / File(s)	Summary
Test Feature & Documentation dfetch/manifest/project.py, features/patch-fuzzy-matching.feature	Documentation references to patch scenarios expanded, and new BDD feature file introduced to test patch fuzzy matching behavior when upstream context changes.
Test Step Definitions features/steps/generic_steps.py, features/steps/git_steps.py	Step definitions enhanced with directory parameter support for patch file creation and new step added for modifying files in named git repositories.

Estimated code review effort

🎯 2 (Simple) | ⏱️ ~10 minutes

Possibly related PRs

Doc update + fix format-patch #985: Modifies the same BDD test assets and step implementations for patch-fuzzy-matching feature
Extend documentation #936: Updates patch handling documentation in dfetch/manifest/project.py to support multiple patch scenarios
New files not part of dfetch diff generated patch #888: Modifies step implementations in features/steps/ with directory-awareness parameters

Suggested labels

development

Suggested reviewers

ben-edna

🚥 Pre-merge checks | ✅ 3 ✅ Passed checks (3 passed)

Check name	Status	Explanation
Description Check	✅ Passed	Check skipped - CodeRabbit’s high-level summary is enabled.
Title check	✅ Passed	The title accurately reflects the main objective of the PR, which is to add new test scenarios for patch functionality.
Docstring Coverage	✅ Passed	No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.

✏️ Tip: You can configure your own custom pre-merge checks in the settings.

✨ Finishing touches 🧪 Generate unit tests (beta)

Create PR with unit tests
Post copyable unit tests in a comment
Commit unit tests in branch test-patching

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands and usage tips.

Actionable comments posted: 3

🤖 Fix all issues with AI agents

In `@dfetch/manifest/project.py`:
- Around line 274-275: The SVN documentation block in project.py incorrectly
includes the git-only feature file patch-fuzzy-matching.feature; either remove
the line ".. scenario-include:: ../features/patch-fuzzy-matching.feature" from
the SVN section or add a SVN-specific variant (e.g.,
../features/patch-fuzzy-matching-svn.feature) that replaces git-specific steps
like "a git repository" and "in git-repository" with SVN equivalents, and update
the include to reference that new SVN variant; look for the existing SVN-related
include lines (e.g., ".. scenario-include::
../features/patch-after-fetch-svn.feature") to place or remove the reference
accordingly.

In `@features/patch-fuzzy-matching.feature`:
- Around line 49-58: The step that creates the override patch is writing it to
the wrong directory: change the Gherkin step "And the patch file
'SomeProject.patch' in SomeProject" so the patch is created under the manifest
directory (i.e., in MyProject) instead of SomeProject; update the step fixture
so the file path for the patch is MyProject/SomeProject.patch to ensure dfetch
resolves the manifest-relative patch declared as patch: SomeProject.patch.
- Around line 60-71: The test hardcodes the Dfetch version string; update the
multisub patterns used by the check_output function so the dfetch_title regex is
applied to replace version strings. In practice, import/Reference the existing
dfetch_title regex (from generic_steps.py) and add it to the multisub list
inside check_output (the multisub variable used in check_output) so version
lines like "Dfetch (0.11.0)" are normalized along with existing substitutions
for git hashes and timestamps.

spoorcc added 2 commits February 9, 2026 21:41

Add additional scenarios for patch fuzzing

5ffc3b9

Add more scenarios to docs

b7d5681

spoorcc added documentation Improvements or additions to documentation testing Something wrong with tests labels Feb 9, 2026

spoorcc temporarily deployed to testpypi February 9, 2026 20:44 — with GitHub Actions Inactive

coderabbitai Bot reviewed Feb 9, 2026

View reviewed changes

Comment thread dfetch/manifest/project.py Outdated

Comment thread features/patch-fuzzy-matching.feature Outdated

Comment thread features/patch-fuzzy-matching-git.feature

spoorcc added 2 commits February 9, 2026 22:06

Mark scenario as git specific and remove it from svn docs

ddd1b15

Improve scenarios

ef67f6d

spoorcc temporarily deployed to testpypi February 9, 2026 21:12 — with GitHub Actions Inactive

spoorcc merged commit 4796e64 into main Feb 9, 2026
38 checks passed

spoorcc deleted the test-patching branch February 9, 2026 21:15

coderabbitai Bot mentioned this pull request Mar 29, 2026

Redesign documentation styling and reorganize manual structure #1089

Merged

Add more tests for patching by spoorcc · Pull Request #987 · dfetch-org/dfetch · GitHub

Uh oh!

Add more tests for patching - #987

Add more tests for patching#987
spoorcc merged 4 commits into
mainfrom
test-patching

spoorcc commented Feb 9, 2026 •
edited by coderabbitai Bot
Loading

Uh oh!

Uh oh!

coderabbitai Bot commented Feb 9, 2026 •
edited
Loading

Uh oh!

Uh oh!

coderabbitai Bot left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

1 participant

Add more tests for patching by spoorcc · Pull Request #987 · dfetch-org/dfetch · GitHub

Uh oh!

Add more tests for patching - #987

Add more tests for patching#987spoorcc merged 4 commits intomaindfetch-org/dfetch:mainfrom test-patchingdfetch-org/dfetch:test-patchingCopy head branch name to clipboard

Conversation

spoorcc commented Feb 9, 2026 • edited by coderabbitai Bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary by CodeRabbit

Uh oh!

coderabbitai Bot commented Feb 9, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Rate limit exceeded

Walkthrough

Changes

Estimated code review effort

Possibly related PRs

Suggested labels

Suggested reviewers

Uh oh!

coderabbitai Bot left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

1 participant

Add more tests for patching#987
spoorcc merged 4 commits into
mainfrom
test-patching

spoorcc commented Feb 9, 2026 •
edited by coderabbitai Bot
Loading

coderabbitai Bot commented Feb 9, 2026 •
edited
Loading