Summary:

JSON Output for RBTools Patch Command

Review Request #11588 — Created April 11, 2021 and submitted Oct. 25, 2021, 9:38 p.m.

Information
Owner:	ryankang
Repository:	RBTools
Branch:	master
Bugs:
Depends On:	~~11521~~
Reviewers
Groups:	rbtools, students
People:

Description

Depends on JSON output object from r#11521.

JSON object includes:

patch_output: result of result.patch_output.strip()
conflicting_files: list of filenames that are conflicting with patch
diff_body: contents of the patches

Testing Done

Ran unit tests in Commands and passed all tests

Commits

Summary
Added standard output to JSON output
Added more errors to JSON object when conflicts are found
Fixed space error in blank line

Screenshots

Issues

Description	From	Last Updated
W293 blank line contains whitespace	reviewbot	April 11, 2021, 2:58 p.m.

flake8 failed.

JSHint passed.

flake8

rbtools/commands/patch.py (Diff revision 1)
Show all issues
```
W293 blank line contains whitespace
```

Commits:

	Summary
-	Added standard output to JSON output
-	Added more errors to JSON object when conflicts are found
+	Added standard output to JSON output
+	Added more errors to JSON object when conflicts are found
+	Fixed space error in blank line

Diff:

Revision 2 (+29 -1)

Show changes

rbtools/commands/patch.py

Checks run (2 succeeded)

flake8 passed.

JSHint passed.

Status: Closed (submitted)

Change Summary:

Pushed to master (e0f124c)

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