Summary

Fix and enhance support for patching Subversion diffs.

Review Request #12635 — Created Sept. 24, 2022 and submitted Sept. 28, 2022, 12:57 a.m.

Information

Owner

chipx86

Repository

RBTools

Branch

release-4.x

Bugs

Depends On

Reviewers

Groups

rbtools

People

Description

Subversion diff patching wasn't implemented very well. svn patch
almost always returns a 0 exit code, even if nothing is applied or
conflicts are found. Because of this, we'd claim a patch applied
successfully even if it didn't. We also didn't include information on
conflicts, and we had string type issues for empty files.

This fixes all of this, and adds unit tests (except for empty files,
which will be covered in an upcoming change).

We now parse the output of svn patch to determine whether anything was
applied and whether anything had conflicts, returning those details in
the PatchResult.

We also now patch empty files correctly, by fixing the string type
issues.

Unit tests have been fully fleshed out for most of this.

Testing Done

Unit tests pass.

Commits

Summary	ID
Fix and enhance support for patching Subversion diffs. Subversion diff patching wasn't implemented very well. `svn patch` almost always returns a 0 exit code, even if nothing is applied or conflicts are found. Because of this, we'd claim a patch applied successfully even if it didn't. We also didn't include information on conflicts, and we had string type issues for empty files. This fixes all of this, and adds unit tests (except for empty files, which will be covered in an upcoming change). We now parse the output of `svn patch` to determine whether anything was applied and whether anything had conflicts, returning those details in the `PatchResult`. We also now patch empty files correctly, by fixing the string type issues. Unit tests have been fully fleshed out for most of this.	64410e691bb05cc5ae771480055a31502f9f57d9

Summary

Fix and enhance support for patching Subversion diffs.

Subversion diff patching wasn't implemented very well. `svn patch` almost always returns a 0 exit code, even if nothing is applied or conflicts are found. Because of this, we'd claim a patch applied successfully even if it didn't. We also didn't include information on conflicts, and we had string type issues for empty files. This fixes all of this, and adds unit tests (except for empty files, which will be covered in an upcoming change). We now parse the output of `svn patch` to determine whether anything was applied and whether anything had conflicts, returning those details in the `PatchResult`. We also now patch empty files correctly, by fixing the string type issues. Unit tests have been fully fleshed out for most of this.

64410e691bb05cc5ae771480055a31502f9f57d9

Issues

Description	From	Last Updated
Instead of "conflicting files", can we use the slightly more common lingo of "files with conflicts"?	david	Sept. 28, 2022, 12:55 a.m.

flake8 passed.

JSHint passed.

Ship it!

rbtools/clients/svn.py (Diff revision 1)

The issue has been resolved. Show all issues

Instead of "conflicting files", can we use the slightly more common lingo of "files with conflicts"?

Status:: Completed
Change Summary:: Pushed to release-4.x (c99a1d6)