Enhance 'rbt patch' for better merging and feedback.
Review Request #6236 — Created Aug. 16, 2014 and submitted
By default,
git applyisn't very good at handling patches that don't
apply perfectly cleanly. It will just fail with an error. That means if
you attempt to apply a patch, and the underlying files have changed,
even just a little, nothing will be applied, and the user will be shown
an error.
git applyhas a nice option we can use to force better behavior:
-3(or--3way). This enables Git's merge behavior for patches, and will
also generate conflict markers. This option implies--index, so that has
been removed from the command line.When a patch does fail to apply, partially or fully, it no longer shows
an "Unable to execute command" error. Instead,apply_patch()returns a
PatchResult, which contains the state of the patch operation, including
any list of conflicting files that could be reported, and any output
from the patch command line.This is then shown to the user. The output shows that the patch is being
applied, then shows the patch output, and then the status as a
human-readable message. If any conflicting files were seen (Git only,
for now), those will be shown as well.
Tested with both Git and Mercurial, in all failure/success modes.
For Git, I tested with and without a list of conflicting files.
- Change Summary:
-
Missed a line when
git adding. - Commit:
-
ea220642fe584e0e3bf51eae1b4ec9602930bb751e0ab603a9d169e242bfc8dd1305ca86b5d17d06
-
Tool: Pyflakes Processed Files: rbtools/commands/patch.py rbtools/clients/__init__.py rbtools/clients/mercurial.py rbtools/utils/process.py rbtools/clients/git.py Tool: PEP8 Style Checker Processed Files: rbtools/commands/patch.py rbtools/clients/__init__.py rbtools/clients/mercurial.py rbtools/utils/process.py rbtools/clients/git.py
- Change Summary:
-
rbt patch will no longer try to create a commit unless the patch applied cleanly.
- Bugs:
-
- Commit:
1e0ab603a9d169e242bfc8dd1305ca86b5d17d06d886cdf389f3a4a8b1b6a631c1a7efb9f9fe0ea1
-
Tool: PEP8 Style Checker Processed Files: rbtools/commands/patch.py rbtools/clients/__init__.py rbtools/clients/mercurial.py rbtools/utils/process.py rbtools/clients/git.py Tool: Pyflakes Processed Files: rbtools/commands/patch.py rbtools/clients/__init__.py rbtools/clients/mercurial.py rbtools/utils/process.py rbtools/clients/git.py
Tool: Pyflakes Processed Files: rbtools/commands/patch.py rbtools/clients/__init__.py rbtools/clients/mercurial.py rbtools/utils/process.py rbtools/clients/git.py Tool: PEP8 Style Checker Processed Files: rbtools/commands/patch.py rbtools/clients/__init__.py rbtools/clients/mercurial.py rbtools/utils/process.py rbtools/clients/git.py