RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-14 09:34:59 +00:00
Code Issues Activity Actions

patch+LibDiff: Implement 'strip' of filenames when parsing patch

Browse source 
Implement the patch '-p' / '--strip' option, which strips the given
number of leading components from filenames parsed in the patch header.
If not given this option defaults to the basename of that path.
This commit is contained in:
Shannon Booth 2023-07-14 12:07:00 +12:00 • committed by Andrew Kaster
parent 87e2b8e343
commit 81df0278b1
4 changed files with 80 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Userland/Utilities/patch.cpp
View file

@ -30,9 +30,11 @@ static ErrorOr<void> do_patch(StringView path_of_file_to_patch, Diff::Patch cons
ErrorOr<int> serenity_main(Main::Arguments arguments)
{
StringView directory;
Optional<size_t> strip_count;
Core::ArgsParser args_parser;
args_parser.add_option(directory, "Change the working directory to <directory> before applying the patch file", "directory", 'd', "directory");
args_parser.add_option(strip_count, "Strip given number of leading path components from file names (defaults as basename)", "strip", 'p', "count");
args_parser.parse(arguments);
if (!directory.is_null())
@ -45,7 +47,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
// FIXME: Support multiple patches in the patch file.
Diff::Parser parser(patch_content);
Diff::Patch patch;
patch.header = TRY(parser.parse_header());
patch.header = TRY(parser.parse_header(strip_count));
patch.hunks = TRY(parser.parse_hunks());
// FIXME: Support adding/removing a file, and asking for file to patch as fallback otherwise.