Summary

Add Git binary file patching.

Review Request #14714 — Created Nov. 28, 2025 and submitted Jan. 9, 2026, 11:20 a.m.

Information

Owner

david

Repository

RBTools

Branch

master

Bugs

Depends On

Reviewers

Groups

rbtools

People

Description

This change adds support to the GitPatcher for applying binary files
as part of changes. For git, this requires that we ask git apply to
exclude those particular files while applying, because otherwise it will
error out because there's no binary file data in the patch itself. We
then use the base patcher infrastructure for iterating through the
files, but provide overrides that can register adds, moves, and deletes
with git.

Testing Done


Ran unit tests.
Used rbt patch with a bunch of changes that did various file

  operations on binary files.

Commits

Summary	ID
Add Git binary file patching. This change adds support to the `GitPatcher` for applying binary files as part of changes. For git, this requires that we ask `git apply` to exclude those particular files while applying, because otherwise it will error out because there's no binary file data in the patch itself. We then use the base patcher infrastructure for iterating through the files, but provide overrides that can register adds, moves, and deletes with git. Testing Done: - Ran unit tests. - Used `rbt patch` with a bunch of changes that did various file operations on binary files.	otvzyzqqpkzmkpnlkkwoyumrmozrlxol

Summary

Add Git binary file patching.

This change adds support to the `GitPatcher` for applying binary files as part of changes. For git, this requires that we ask `git apply` to exclude those particular files while applying, because otherwise it will error out because there's no binary file data in the patch itself. We then use the base patcher infrastructure for iterating through the files, but provide overrides that can register adds, moves, and deletes with git. Testing Done: - Ran unit tests. - Used `rbt patch` with a bunch of changes that did various file operations on binary files.

otvzyzqqpkzmkpnlkkwoyumrmozrlxol

Issues

Description	From	Last Updated
line too long (89 > 79 characters) Column: 80 Error code: E501	reviewbot	Nov. 28, 2025, 5:15 p.m.
line too long (89 > 79 characters) Column: 80 Error code: E501	reviewbot	Nov. 28, 2025, 5:15 p.m.
line too long (89 > 79 characters) Column: 80 Error code: E501	reviewbot	Nov. 28, 2025, 5:15 p.m.
line too long (89 > 79 characters) Column: 80 Error code: E501	reviewbot	Nov. 28, 2025, 5:15 p.m.
line too long (89 > 79 characters) Column: 80 Error code: E501	reviewbot	Nov. 28, 2025, 5:15 p.m.
Let's pull patch.binary_files out into a variable.	maubin	Dec. 30, 2025, 10:29 a.m.
Can we make this one line?	maubin	Dec. 30, 2025, 10:29 a.m.
Do we need to escape the paths here?	maubin	Dec. 30, 2025, 10:31 a.m.

flake8 failed.

JSHint passed.

flake8

rbtools/clients/tests/test_git.py (Diff revision 1)
The issue has been dropped. Show all issues
```
line too long (89 > 79 characters)

Column: 80
Error code: E501
```
rbtools/clients/tests/test_git.py (Diff revision 1)
The issue has been dropped. Show all issues
```
line too long (89 > 79 characters)

Column: 80
Error code: E501
```
rbtools/clients/tests/test_git.py (Diff revision 1)
The issue has been dropped. Show all issues
```
line too long (89 > 79 characters)

Column: 80
Error code: E501
```
rbtools/clients/tests/test_git.py (Diff revision 1)
The issue has been dropped. Show all issues
```
line too long (89 > 79 characters)

Column: 80
Error code: E501
```
rbtools/clients/tests/test_git.py (Diff revision 1)
The issue has been dropped. Show all issues
```
line too long (89 > 79 characters)

Column: 80
Error code: E501
```

Commits:

	Summary	ID
	Add Git binary file patching. This change adds support to the `GitPatcher` for applying binary files as part of changes. For git, this requires that we ask `git apply` to exclude those particular files while applying, because otherwise it will error out because there's no binary file data in the patch itself. We then use the base patcher infrastructure for iterating through the files, but provide overrides that can register adds, moves, and deletes with git. Testing Done: - Ran unit tests. - Used `rbt patch` with a bunch of changes that did various file operations on binary files.	otvzyzqqpkzmkpnlkkwoyumrmozrlxol
	Add Git binary file patching. This change adds support to the `GitPatcher` for applying binary files as part of changes. For git, this requires that we ask `git apply` to exclude those particular files while applying, because otherwise it will error out because there's no binary file data in the patch itself. We then use the base patcher infrastructure for iterating through the files, but provide overrides that can register adds, moves, and deletes with git. Testing Done: - Ran unit tests. - Used `rbt patch` with a bunch of changes that did various file operations on binary files.	otvzyzqqpkzmkpnlkkwoyumrmozrlxol

Diff:

Revision 2 (+1928 -16)

Show changes

	rbtools/clients/git.py
	rbtools/clients/tests/test_git.py

Checks run (2 succeeded)

flake8 passed.

JSHint passed.

Change Summary:

Use new make_binary_file_patch helper.

Commits:

	Summary	ID
	Add Git binary file patching. This change adds support to the `GitPatcher` for applying binary files as part of changes. For git, this requires that we ask `git apply` to exclude those particular files while applying, because otherwise it will error out because there's no binary file data in the patch itself. We then use the base patcher infrastructure for iterating through the files, but provide overrides that can register adds, moves, and deletes with git. Testing Done: - Ran unit tests. - Used `rbt patch` with a bunch of changes that did various file operations on binary files.	otvzyzqqpkzmkpnlkkwoyumrmozrlxol
	Add Git binary file patching. This change adds support to the `GitPatcher` for applying binary files as part of changes. For git, this requires that we ask `git apply` to exclude those particular files while applying, because otherwise it will error out because there's no binary file data in the patch itself. We then use the base patcher infrastructure for iterating through the files, but provide overrides that can register adds, moves, and deletes with git. Testing Done: - Ran unit tests. - Used `rbt patch` with a bunch of changes that did various file operations on binary files.	otvzyzqqpkzmkpnlkkwoyumrmozrlxol

Diff:

Revision 3 (+1802 -16)

Show changes

	rbtools/clients/git.py
	rbtools/clients/tests/test_git.py

Checks run (2 succeeded)

flake8 passed.

JSHint passed.

rbtools/clients/git.py (Diff revision 3)
The issue has been resolved. Show all issues
```
Let's pull patch.binary_files out into a variable.
```
rbtools/clients/git.py (Diff revision 3)
The issue has been resolved. Show all issues
```
Can we make this one line?
```

rbtools/clients/git.py (Diff revision 3)

The issue has been dropped. Show all issues

Do we need to escape the paths here?

david Dec. 30, 2025, 10:32 a.m.

Not according to my reading of the docs. git add and git rm both handle pathspecs (to add/remove multiple files at once) but a mv operates on filenames directly.

Commits:

	Summary	ID
	Add Git binary file patching. This change adds support to the `GitPatcher` for applying binary files as part of changes. For git, this requires that we ask `git apply` to exclude those particular files while applying, because otherwise it will error out because there's no binary file data in the patch itself. We then use the base patcher infrastructure for iterating through the files, but provide overrides that can register adds, moves, and deletes with git. Testing Done: - Ran unit tests. - Used `rbt patch` with a bunch of changes that did various file operations on binary files.	otvzyzqqpkzmkpnlkkwoyumrmozrlxol
	Add Git binary file patching. This change adds support to the `GitPatcher` for applying binary files as part of changes. For git, this requires that we ask `git apply` to exclude those particular files while applying, because otherwise it will error out because there's no binary file data in the patch itself. We then use the base patcher infrastructure for iterating through the files, but provide overrides that can register adds, moves, and deletes with git. Testing Done: - Ran unit tests. - Used `rbt patch` with a bunch of changes that did various file operations on binary files.	otvzyzqqpkzmkpnlkkwoyumrmozrlxol

Diff:

Revision 4 (+1822 -16)

Show changes

	rbtools/clients/git.py
	rbtools/clients/tests/test_git.py

Checks run (2 succeeded)

flake8 passed.

JSHint passed.

Commits:

	Summary	ID
	Add Git binary file patching. This change adds support to the `GitPatcher` for applying binary files as part of changes. For git, this requires that we ask `git apply` to exclude those particular files while applying, because otherwise it will error out because there's no binary file data in the patch itself. We then use the base patcher infrastructure for iterating through the files, but provide overrides that can register adds, moves, and deletes with git. Testing Done: - Ran unit tests. - Used `rbt patch` with a bunch of changes that did various file operations on binary files.	otvzyzqqpkzmkpnlkkwoyumrmozrlxol
	Add Git binary file patching. This change adds support to the `GitPatcher` for applying binary files as part of changes. For git, this requires that we ask `git apply` to exclude those particular files while applying, because otherwise it will error out because there's no binary file data in the patch itself. We then use the base patcher infrastructure for iterating through the files, but provide overrides that can register adds, moves, and deletes with git. Testing Done: - Ran unit tests. - Used `rbt patch` with a bunch of changes that did various file operations on binary files.	otvzyzqqpkzmkpnlkkwoyumrmozrlxol

Diff:

Revision 5 (+1834 -16)

Show changes

	rbtools/clients/git.py
	rbtools/clients/tests/test_git.py

Checks run (2 succeeded)

flake8 passed.

JSHint passed.

Ship it!

```
Ship It!
```

Status:: Completed
Change Summary:: Pushed to master (a67ebbd)