Summary

Update rbt patch for typing, the new Patch class, and crash fixes.

Review Request #13970 — Created June 10, 2024 and submitted Oct. 10, 2024, 3:47 p.m.

Information

Owner

chipx86

Repository

RBTools

Branch

release-5.x

Bugs

Depends On

~~13969~~

Reviewers

Groups

rbtools

People

Description

rbt patch now has type hints all throughout. This helped catch some

places where we were mixing types, leading to crashes. Notably, JSON

output would crash when dealing with conflicting files represented as

Unicode strings (which are expectd due to the type hints) rather than

byte strings.
It now uses the Patch class to track patches to apply, wrapped by a

small PendingPatchInfo dictionary with the rest of the information

that it needs to track.
This is in preparation for using new patching logic for more SCM-driven

patch application, which is in development now.
As a note, the Patch command has been renamed to PatchCommand, to

avoid conflicts with the Patch class. This will require those using

the development tree to re-run pip install -e . to register the new

entrypoint.

Testing Done

Commits

Summary	ID
Update rbt patch for typing, the new Patch class, and crash fixes. `rbt patch` now has type hints all throughout. This helped catch some places where we were mixing types, leading to crashes. Notably, JSON output would crash when dealing with conflicting files represented as Unicode strings (which are expectd due to the type hints) rather than byte strings. It now uses the `Patch` class to track patches to apply, wrapped by a small `PendingPatchInfo` dictionary with the rest of the information that it needs to track. This is in preparation for using new patching logic for more SCM-driven patch application, which is in development now. As a note, the `Patch` command has been renamed to `PatchCommand`, to avoid conflicts with the `Patch` class. This will require those using the development tree to re-run `pip install -e .` to register the new entrypoint.	3517d8ff4c0d0123a8e135f6c327c4e4ac18ded5

Summary

Update rbt patch for typing, the new Patch class, and crash fixes.

`rbt patch` now has type hints all throughout. This helped catch some places where we were mixing types, leading to crashes. Notably, JSON output would crash when dealing with conflicting files represented as Unicode strings (which are expectd due to the type hints) rather than byte strings. It now uses the `Patch` class to track patches to apply, wrapped by a small `PendingPatchInfo` dictionary with the rest of the information that it needs to track. This is in preparation for using new patching logic for more SCM-driven patch application, which is in development now. As a note, the `Patch` command has been renamed to `PatchCommand`, to avoid conflicts with the `Patch` class. This will require those using the development tree to re-run `pip install -e .` to register the new entrypoint.

3517d8ff4c0d0123a8e135f6c327c4e4ac18ded5

Issues

Description	From	Last Updated
You define patch_output here, forgot to use it in the conditional, and then redefine it.	maubin	July 13, 2024, 1:07 a.m.

flake8 passed.

JSHint passed.

Ship it!

```
Ship It!
```

rbtools/commands/patch.py (Diff revision 1)

The issue has been resolved. Show all issues

You define patch_output here, forgot to use it in the conditional, and then redefine it.

Change Summary:

Changed patch_output handling to avoid redundant assignments and to ensure we only output if it's a non-empty string.

Commits:

	Summary	ID
	Update rbt patch for typing, the new Patch class, and crash fixes. `rbt patch` now has type hints all throughout. This helped catch some places where we were mixing types, leading to crashes. Notably, JSON output would crash when dealing with conflicting files represented as Unicode strings (which are expectd due to the type hints) rather than byte strings. It now uses the `Patch` class to track patches to apply, wrapped by a small `PendingPatchInfo` dictionary with the rest of the information that it needs to track. This is in preparation for using new patching logic for more SCM-driven patch application, which is in development now. As a note, the `Patch` command has been renamed to `PatchCommand`, to avoid conflicts with the `Patch` class. This will require those using the development tree to re-run `pip install -e .` to register the new entrypoint.	2386e4bb7cbf21c665b02f1ae8c82babf67f4747
	Update rbt patch for typing, the new Patch class, and crash fixes. `rbt patch` now has type hints all throughout. This helped catch some places where we were mixing types, leading to crashes. Notably, JSON output would crash when dealing with conflicting files represented as Unicode strings (which are expectd due to the type hints) rather than byte strings. It now uses the `Patch` class to track patches to apply, wrapped by a small `PendingPatchInfo` dictionary with the rest of the information that it needs to track. This is in preparation for using new patching logic for more SCM-driven patch application, which is in development now. As a note, the `Patch` command has been renamed to `PatchCommand`, to avoid conflicts with the `Patch` class. This will require those using the development tree to re-run `pip install -e .` to register the new entrypoint.	3517d8ff4c0d0123a8e135f6c327c4e4ac18ded5

Diff:

Revision 2 (+324 -200)

Show changes

	setup.py
	rbtools/commands/patch.py

Checks run (2 succeeded)

flake8 passed.

JSHint passed.

Ship it!

```
Ship It!
```

Ship it!

```
Ship It!
```

Status:: Completed
Change Summary:: Pushed to release-5.x (1e886a2)