summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 0133dab)
raw | patch | inline | side by side (parent: 0133dab)
author | Johan Herland <johan@herland.net> | |
Sun, 10 Apr 2011 22:48:52 +0000 (00:48 +0200) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Mon, 11 Apr 2011 18:16:15 +0000 (11:16 -0700) |
Currently, the --dirstat analysis ignores when lines within a file are
rearranged, because the "damage" calculated by show_dirstat() is 0.
However, if the object name has changed, we already know that there is
some damage, and it is unintuitive to claim there is _no_ damage.
Teach show_dirstat() to assign a minimum amount of damage (== 1) to
entries for which the analysis otherwise yields zero damage, to still
represent that these files are changed, instead of saying that there
is no change.
Also, skip --dirstat analysis when the object names are the same (e.g. for
a pure file rename).
Signed-off-by: Johan Herland <johan@herland.net>
Acked-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
rearranged, because the "damage" calculated by show_dirstat() is 0.
However, if the object name has changed, we already know that there is
some damage, and it is unintuitive to claim there is _no_ damage.
Teach show_dirstat() to assign a minimum amount of damage (== 1) to
entries for which the analysis otherwise yields zero damage, to still
represent that these files are changed, instead of saying that there
is no change.
Also, skip --dirstat analysis when the object names are the same (e.g. for
a pure file rename).
Signed-off-by: Johan Herland <johan@herland.net>
Acked-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/diff-options.txt | patch | blob | history | |
diff.c | patch | blob | history | |
t/t4013-diff-various.sh | patch | blob | history | |
t/t4013/diff.diff_--dirstat_initial_rearrange | patch | blob | history |
index 23772d615d22e0a4bbad41e82e156634981d23c3..7e4bd425e1fec23bbca0e89a0d7b4f53cf4f4483 100644 (file)
counted for the parent directory, unless `--cumulative` is used.
+
Note that the `--dirstat` option computes the changes while ignoring
-pure code movements within a file. In other words, rearranging lines
-in a file is not counted as a change.
+the amount of pure code movements within a file. In other words,
+rearranging lines in a file is not counted as much as other changes.
--dirstat-by-file[=<limit>]::
Same as `--dirstat`, but counts changed files instead of lines.
index 4f5270b8dbc05c820c24075b499fe26afacf52a8..1f44cb4237317fd2e36bc9b00047b67f7e844e17 100644 (file)
--- a/diff.c
+++ b/diff.c
else
content_changed = 1;
+ if (!content_changed) {
+ /*
+ * The SHA1 has not changed, so pre-/post-content is
+ * identical. We can therefore skip looking at the
+ * file contents altogether.
+ */
+ damage = 0;
+ goto found_damage;
+ }
+
if (DIFF_OPT_TST(options, DIRSTAT_BY_FILE)) {
/*
* In --dirstat-by-file mode, we don't really need to
* add this file to the list of results
* (with each file contributing equal damage).
*/
- damage = content_changed ? 1 : 0;
+ damage = 1;
goto found_damage;
}
* Original minus copied is the removed material,
* added is the new material. They are both damages
* made to the preimage.
+ * If the resulting damage is zero, we know that
+ * diffcore_count_changes() considers the two entries to
+ * be identical, but since content_changed is true, we
+ * know that there must have been _some_ kind of change,
+ * so we force all entries to have damage > 0.
*/
damage = (p->one->size - copied) + added;
+ if (!damage)
+ damage = 1;
found_damage:
ALLOC_GROW(dir.files, dir.nr + 1, dir.alloc);
index 6428a905ab76696c6d7d9e20084b3368ac855a14..93a6f208710befc064b7b99bcd758bb8b6381918 100755 (executable)
--- a/t/t4013-diff-various.sh
+++ b/t/t4013-diff-various.sh
diff --no-index dir dir3
diff master master^ side
diff --dirstat master~1 master~2
-# --dirstat doesn't notice changes that simply rearrange existing lines
diff --dirstat initial rearrange
-# ...but --dirstat-by-file does notice changes that only rearrange lines
diff --dirstat-by-file initial rearrange
EOF
diff --git a/t/t4013/diff.diff_--dirstat_initial_rearrange b/t/t4013/diff.diff_--dirstat_initial_rearrange
index fb2e17dd2e48f5b4bc0a03ca274156ffeb21782d..5fb02c13bc51021aa6405a2271fce150432b6ce8 100644 (file)
$ git diff --dirstat initial rearrange
+ 100.0% dir/
$