File moves are ignored by filterdiff #22

jdm · 2018-02-07T16:02:26Z

A diff like:

diff --git a/tests/wpt/web-platform-tests/2dcontext/transformations/2d.transformation.order.html b/tests/wpt/web-platform-tests/2dcontext/transformations/2d.transformation.order-new.html
similarity index 100%
rename from tests/wpt/web-platform-tests/2dcontext/transformations/2d.transformation.order.html
rename to tests/wpt/web-platform-tests/2dcontext/transformations/2d.transformation.order-new.html

gets excluded when I run filterdiff -p 1 -i tests/wpt/web-platform-tests.

The text was updated successfully, but these errors were encountered:

jdm · 2018-02-07T16:03:13Z

I'm pretty sure the cause is https://github.com/twaugh/patchutils/blob/master/src/filterdiff.c#L1070-L1073.

sergiomb2 · 2018-02-07T16:08:44Z

can you post the diff file or a kind of sample please ?

jdm · 2018-02-07T16:08:53Z

More specifically, with this diff:

diff --git a/tests/wpt/web-platform-tests/2dcontext/transformations/2d.transformation.order.html b/tests/wpt/web-platform-tests/2dcontext/transformations/2d.transformation.order-new.html
similarity index 100%
rename from tests/wpt/web-platform-tests/2dcontext/transformations/2d.transformation.order.html
rename to tests/wpt/web-platform-tests/2dcontext/transformations/2d.transformation.order-new.html
diff --git a/tests/wpt/web-platform-tests/2dcontext/transformations/2d.transformation.scale.large.html b/tests/wpt/web-platform-tests/2dcontext/transformations/2d.transformation.scale.large.html
deleted file mode 100644
index 926530d1f7e6..000000000000
--- a/tests/wpt/web-platform-tests/2dcontext/transformations/2d.transformation.scale.large.html
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! This test has been generated by tools/gentest.py. -->
-<title>Canvas test: 2d.transformation.scale.large</title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/common/canvas-tests.js"></script>
-<link rel="stylesheet" href="/common/canvas-tests.css">
-<body class="show_output">
-
-<h1>2d.transformation.scale.large</h1>
-<p class="desc">scale() with large scale factors works</p>
-
-<p class="notes">Not really that large at all, but it hits the limits in Firefox.
-<p class="output">Actual output:</p>
-<canvas id="c" class="output" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<p class="output expectedtext">Expected output:<p><img src="/images/green-100x50.png" class="output expected" id="expected" alt="">
-<ul id="d"></ul>
-<script>
-var t = async_test("scale() with large scale factors works");
-_addTest(function(canvas, ctx) {
-
-ctx.fillStyle = '#f00';
-ctx.fillRect(0, 0, 100, 50);
-
-ctx.scale(1e5, 1e5);
-ctx.fillStyle = '#0f0';
-ctx.fillRect(0, 0, 1, 1);
-_assertPixel(canvas, 50,25, 0,255,0,255, "50,25", "0,255,0,255");
-
-
-});
-</script>
-

jdm · 2018-02-07T16:09:55Z

filterdiff collects the first five lines, so there are two diff headers, then throws them all out because pat_exclude and verbose are both false at https://github.com/twaugh/patchutils/blob/master/src/filterdiff.c#L1075-L1083.

sergiomb2 · 2018-02-07T16:15:00Z

filterdiff [[-i PATTERN] | [--include=PATTERN]] [[-I FILE] | [--include-from-file=FILE]] [[-p n]

what you want with -p -i ? is a syntax error

filterdiff: option requires an argument -- 'p'

cat yourfile | filterdiff works

jdm · 2018-02-07T16:20:13Z

Sorry, I meant -p 1.

jdm · 2018-02-07T16:21:38Z

If I use -v it is a workaround for this particular diff, but it incorrectly includes moves that do not match the pattern.

sergiomb2 · 2018-02-07T16:27:32Z

I don't understood the problem , is the -i ?

jdm · 2018-02-07T16:32:30Z

The problem is that the diff contains a change to a file (tests/wpt/web-platform-tests/2dcontext/transformations/2d.transformation.order.html) that matches the pattern provided to -i (tests/wpt/web-platform-tests), but the change is not included in the filtered diff.

sergiomb2 · 2018-02-08T15:52:46Z

+++ /dev/null

as I understand -i just includes files in diff that match if you just have the delete file , what you except ?
Anyway you fail to provide the complete example , I still have to deduce what you mean and what example you use .

jdm · 2018-03-18T02:33:41Z

I posted the complete example in #22 (comment). When I filter that diff using filterdiff -p 1 -i tests/wpt/web-platform-tests it only shows the file that is removed, and does not include the file that is renamed.

sergiomb2 · 2018-03-21T01:01:08Z

I think you expect something that filterdiff does not do , what you are asking to just show the diffs where file name have "tests/wpt/web-platform-tests"
So you need your git diff not detect similarity and show the rename files , but the real patch

jdm · 2018-03-21T01:21:06Z

Why is that not the expected behaviour of filterdiff?

sergiomb2 · 2018-03-21T01:25:42Z

you need your git diff not detect similarity and don't try detect renamed files and show the complete patch

jdm · 2018-03-21T02:56:50Z

My question is why filterdiff should not be modified to accommodate this diff?

sergiomb2 · 2018-03-21T19:30:56Z

man filterdiff - extract or exclude diffs from a diff file
if file doesn't not have the diff but have rename from / to , what you expect from filterdiff ?

jdm · 2018-03-21T19:56:57Z

I think "diff" is generally used to describe more than just the - and + parts of the diff file. I would consider the renaming information an important part of the diff.

carlfriedrich · 2022-02-25T17:24:16Z

I just encountered the same problem. @jdm Did you manage to find a workaround for this?

jdm · 2022-02-26T17:08:47Z

I no longer remember any of the context for this problem.

sergiomb2 · 2024-02-07T00:30:47Z

I'm pretty sure the cause is https://github.com/twaugh/patchutils/blob/master/src/filterdiff.c#L1070-L1073.

I see, we may try not exclude removes and files permissions as mention in #59

mcepl · 2024-12-28T16:16:54Z

Another test case: when running

$ curl -L -s https://github.com/orbitalquark/scintillua/commit/c6c98d68ecc0.patch \
    |filterdiff --include="lexers/*.lua" -p1

filterdiff ignores these lines:

diff --git a/lexers/ansi_c.lua b/lexers/c.lua
similarity index 100%
rename from lexers/ansi_c.lua
rename to lexers/c.lua
diff --git a/lexers/dmd.lua b/lexers/d.lua
similarity index 100%
rename from lexers/dmd.lua
rename to lexers/d.lua

sarmong · 2025-01-28T19:33:19Z

If anyone is running git diff and then tries to filter with filterdiff, you can use git's builtin pathspec instead, something like this

git diff commit_hash^ commit_hash -- ':(exclude)file1.txt' ':(exclude)file2.txt'

https://git-scm.com/docs/gitglossary#Documentation/gitglossary.txt-aiddefpathspecapathspec

jdm mentioned this issue Feb 7, 2018

Moved files aren't transplanted servo/upstream-wpt-sync-webhook#5

Closed

jtojnar mentioned this issue Nov 15, 2020

fetchpatch: ignores file renames NixOS/nixpkgs#32084

Open

pbsds mentioned this issue Nov 10, 2023

Known fetchpatch and fetchpatch2 issues NixOS/nixpkgs#266556

Open

4 tasks

pbsds mentioned this issue Feb 6, 2024

File permissions/flags are ignored by filterdiff #59

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

File moves are ignored by filterdiff #22

File moves are ignored by filterdiff #22

jdm commented Feb 7, 2018 •

edited

Loading

jdm commented Feb 7, 2018

sergiomb2 commented Feb 7, 2018

jdm commented Feb 7, 2018 •

edited

Loading

jdm commented Feb 7, 2018

sergiomb2 commented Feb 7, 2018

jdm commented Feb 7, 2018

jdm commented Feb 7, 2018

sergiomb2 commented Feb 7, 2018

jdm commented Feb 7, 2018

sergiomb2 commented Feb 8, 2018 •

edited

Loading

jdm commented Mar 18, 2018

sergiomb2 commented Mar 21, 2018 •

edited

Loading

jdm commented Mar 21, 2018

sergiomb2 commented Mar 21, 2018

jdm commented Mar 21, 2018

sergiomb2 commented Mar 21, 2018

jdm commented Mar 21, 2018

carlfriedrich commented Feb 25, 2022

jdm commented Feb 26, 2022

sergiomb2 commented Feb 7, 2024

mcepl commented Dec 28, 2024 •

edited

Loading

sarmong commented Jan 28, 2025 •

edited

Loading

File moves are ignored by filterdiff #22

File moves are ignored by filterdiff #22

Comments

jdm commented Feb 7, 2018 • edited Loading

jdm commented Feb 7, 2018

sergiomb2 commented Feb 7, 2018

jdm commented Feb 7, 2018 • edited Loading

jdm commented Feb 7, 2018

sergiomb2 commented Feb 7, 2018

jdm commented Feb 7, 2018

jdm commented Feb 7, 2018

sergiomb2 commented Feb 7, 2018

jdm commented Feb 7, 2018

sergiomb2 commented Feb 8, 2018 • edited Loading

jdm commented Mar 18, 2018

sergiomb2 commented Mar 21, 2018 • edited Loading

jdm commented Mar 21, 2018

sergiomb2 commented Mar 21, 2018

jdm commented Mar 21, 2018

sergiomb2 commented Mar 21, 2018

jdm commented Mar 21, 2018

carlfriedrich commented Feb 25, 2022

jdm commented Feb 26, 2022

sergiomb2 commented Feb 7, 2024

mcepl commented Dec 28, 2024 • edited Loading

sarmong commented Jan 28, 2025 • edited Loading

jdm commented Feb 7, 2018 •

edited

Loading

jdm commented Feb 7, 2018 •

edited

Loading

sergiomb2 commented Feb 8, 2018 •

edited

Loading

sergiomb2 commented Mar 21, 2018 •

edited

Loading

mcepl commented Dec 28, 2024 •

edited

Loading

sarmong commented Jan 28, 2025 •

edited

Loading