RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 15:27:35 +00:00
Code Issues Activity Actions

LibDiff+patch: Support multiple patches in a single patch file

Browse source 
Multiple patches may be concatenated in the same patch file, such as git
commits which are changing multiple files at the same time. To handle
this, parse each patch in order in the patch file, and apply each patch
sequentially.

To determine whether we are at the end of a patch (and not just parsing
another hunk) the parser will look for a leading '@@ ' after every hunk.
If that is found, there is another hunk. Otherwise, we must be at the
end of this patch.
This commit is contained in:
Shannon Booth 2023-07-12 10:37:26 +12:00 • committed by Sam Atkins
parent ddbd77cca1
commit dd373eacbc
4 changed files with 57 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Userland/Libraries/LibDiff/Hunks.cpp
View file

@ -87,6 +87,14 @@ ErrorOr<String> Parser::parse_file_line(Optional<size_t> const& strip_count)
return stripped_path.to_string();
}
ErrorOr<Patch> Parser::parse_patch(Optional<size_t> const& strip_count)
{
Patch patch;
patch.header = TRY(parse_header(strip_count));
patch.hunks = TRY(parse_hunks());
return patch;
}
ErrorOr<Header> Parser::parse_header(Optional<size_t> const& strip_count)
{
Header header;
@ -111,20 +119,20 @@ ErrorOr<Header> Parser::parse_header(Optional<size_t> const& strip_count)
consume_line();
}
return Error::from_string_literal("Unable to find any patch");
return header;
}
ErrorOr<Vector<Hunk>> Parser::parse_hunks()
{
Vector<Hunk> hunks;
while (!is_eof()) {
while (next_is("@@ ")) {
// Try an locate a hunk location in this hunk. It may be prefixed with information.
auto maybe_location = consume_unified_location();
consume_line();
if (!maybe_location.has_value())
continue;
break;
Hunk hunk { *maybe_location, {} };
@ -178,6 +186,8 @@ ErrorOr<Vector<Hunk>> Parser::parse_hunks()
ErrorOr<Vector<Hunk>> parse_hunks(StringView diff)
{
Parser lexer(diff);
while (!lexer.next_is("@@ ") && !lexer.is_eof())
lexer.consume_line();
return lexer.parse_hunks();
}
}