From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-4.0 required=3.0 tests=ALL_TRUSTED,BAYES_00 shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id F110B1F46D for ; Sat, 4 Jan 2020 03:34:15 +0000 (UTC) From: Eric Wong To: meta@public-inbox.org Subject: [PATCH 2/3] solver: do not enforce order on extended headers Date: Sat, 4 Jan 2020 03:34:14 +0000 Message-Id: <20200104033415.17097-3-e@80x24.org> In-Reply-To: <20200104033415.17097-1-e@80x24.org> References: <20200104033415.17097-1-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: This is needed to work with patches with many renames, such as what makes "git/eebf7a8/s/?b=t%2Ftest-lib.sh" --- lib/PublicInbox/SolverGit.pm | 23 ++++++++++++----------- xt/solver.t | 2 +- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/lib/PublicInbox/SolverGit.pm b/lib/PublicInbox/SolverGit.pm index a78360fd..b12cd9d2 100644 --- a/lib/PublicInbox/SolverGit.pm +++ b/lib/PublicInbox/SolverGit.pm @@ -112,6 +112,8 @@ sub extract_diff ($$) { } state $LF = qr!\r?\n!; + state $ANY = qr![^\r\n]+!; + state $MODE = '100644|120000|100755'; state $FN = qr!(?:("?[^/\n]+/[^\r\n]+)|/dev/null)!; $s =~ m!( # $1 start header lines we save for debugging: @@ -124,17 +126,16 @@ sub extract_diff ($$) { # try to get the pre-and-post filenames as $2 and $3 (?:^diff\x20--git\x20$FN\x20$FN$LF) - # old mode $4 - (?:^old mode\x20(100644|120000|100755)$LF)? - - # ignore other info - (?:^(?:copy|rename|deleted|dissimilarity|similarity).*$LF)? - - # new mode (possibly new file) ($5) - (?:^new\x20(?:file\x20)?mode\x20(100644|120000|100755)$LF)? - - # ignore other info - (?:^(?:copy|rename|deleted|dissimilarity|similarity).*$LF)? + (?:^(?: # pass all this to git-apply: + # old mode $4 + (?:old\x20mode\x20($MODE)) + | + # new mode (possibly new file) ($5) + (?:new\x20(?:file\x20)?mode\x20($MODE)) + | + (?:(?:copy|rename|deleted| + dissimilarity|similarity)$ANY) + )$LF)* )? # end of optional stuff, everything below is required diff --git a/xt/solver.t b/xt/solver.t index 238abecd..e9f24e7f 100644 --- a/xt/solver.t +++ b/xt/solver.t @@ -20,7 +20,7 @@ my $app = sub { # TODO: convert these to self-contained test cases my $todo = { 'git' => [ - # 'eebf7a8/s/?b=t%2Ftest-lib.sh', TODO + 'eebf7a8/s/?b=t%2Ftest-lib.sh', 'eb580ca513/s/?b=remote-odb.c', '776fa90f7f/s/?b=contrib/git-jump/git-jump', '5cd8845/s/?b=submodule.c',