diff: support stat formats with -L
Reuse the line_range_filter in builtin_diffstat() so -L supports
the stat formats and add tests verifying the new behavior.
Ungate the newly enabled options and drop "yet" from the generic
-L rejection message ("does not yet support the requested diff
format"). Some rejected formats do not fit -L at all, so "yet"
wrongly implies they are all awaiting support.
Signed-off-by: Michael Montalbo <mmontalbo@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
seen
Michael Montalbo
Junio C Hamano
parent
d90f8109d4
commit
57d22fe63b
|
|
@ -9,10 +9,12 @@
|
|||
_<start>_ and _<end>_ (or _<funcname>_) must exist in the starting revision.
|
||||
You can specify this option more than once. Implies `--patch`.
|
||||
Patch output can be suppressed using `--no-patch`.
|
||||
Non-patch diff formats `--raw`, `--name-only`, `--name-status`,
|
||||
and `--summary` are supported. Diff stat formats
|
||||
(`--stat`, `--numstat`, `--shortstat`, `--dirstat`) are not
|
||||
currently implemented.
|
||||
The following non-patch diff formats are supported: `--raw`,
|
||||
`--name-only`, `--name-status`, `--summary`, `--stat`, `--numstat`,
|
||||
and `--shortstat`. The stat formats count only lines within the tracked
|
||||
range. `--dirstat` is not supported with `-L`: it summarizes change as each
|
||||
directory's share of the total churn, not as counts for the tracked lines.
|
||||
Use `--numstat` for exact per-file counts within the range.
|
||||
+
|
||||
Patch formatting options such as `--word-diff`, `--color-moved`,
|
||||
`--no-prefix`, and whitespace options (`-w`, `-b`) are supported,
|
||||
|
|
|
|||
13
diff.c
13
diff.c
|
|
@ -4162,7 +4162,18 @@ static void builtin_diffstat(const char *name_a, const char *name_b,
|
|||
xecfg.ctxlen = o->context;
|
||||
xecfg.interhunkctxlen = o->interhunkcontext;
|
||||
xecfg.flags = XDL_EMIT_NO_HUNK_HDR;
|
||||
if (xdi_diff_outf(&mf1, &mf2, NULL,
|
||||
|
||||
if (p->line_ranges) {
|
||||
struct line_range_filter lr_filter;
|
||||
|
||||
line_range_filter_init(&lr_filter, p->line_ranges,
|
||||
diffstat_consume, diffstat);
|
||||
|
||||
if (line_range_filter_diff(&lr_filter, &mf1, &mf2,
|
||||
&xpp, &xecfg))
|
||||
die("unable to generate diffstat for %s",
|
||||
one->path);
|
||||
} else if (xdi_diff_outf(&mf1, &mf2, NULL,
|
||||
diffstat_consume, diffstat, &xpp, &xecfg))
|
||||
die("unable to generate diffstat for %s", one->path);
|
||||
|
||||
|
|
|
|||
|
|
@ -3229,8 +3229,10 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct s
|
|||
(revs->diffopt.output_format &
|
||||
~(DIFF_FORMAT_PATCH | DIFF_FORMAT_NO_OUTPUT |
|
||||
DIFF_FORMAT_RAW | DIFF_FORMAT_NAME |
|
||||
DIFF_FORMAT_NAME_STATUS | DIFF_FORMAT_SUMMARY))))
|
||||
die(_("-L does not yet support the requested diff format"));
|
||||
DIFF_FORMAT_NAME_STATUS | DIFF_FORMAT_SUMMARY |
|
||||
DIFF_FORMAT_NUMSTAT | DIFF_FORMAT_DIFFSTAT |
|
||||
DIFF_FORMAT_SHORTSTAT))))
|
||||
die(_("-L does not support the requested diff format"));
|
||||
|
||||
if (revs->expand_tabs_in_log < 0)
|
||||
revs->expand_tabs_in_log = revs->expand_tabs_in_log_default;
|
||||
|
|
|
|||
|
|
@ -176,24 +176,9 @@ test_expect_success '--name-status shows status and path' '
|
|||
test_grep ! "^@@" actual
|
||||
'
|
||||
|
||||
test_expect_success '--stat is not yet supported with -L' '
|
||||
test_must_fail git log -L1,24:b.c --stat 2>err &&
|
||||
test_grep "does not yet support" err
|
||||
'
|
||||
|
||||
test_expect_success '--numstat is not yet supported with -L' '
|
||||
test_must_fail git log -L1,24:b.c --numstat 2>err &&
|
||||
test_grep "does not yet support" err
|
||||
'
|
||||
|
||||
test_expect_success '--shortstat is not yet supported with -L' '
|
||||
test_must_fail git log -L1,24:b.c --shortstat 2>err &&
|
||||
test_grep "does not yet support" err
|
||||
'
|
||||
|
||||
test_expect_success '--dirstat is not yet supported with -L' '
|
||||
test_expect_success '--dirstat is not supported with -L' '
|
||||
test_must_fail git log -L1,24:b.c --dirstat 2>err &&
|
||||
test_grep "does not yet support" err
|
||||
test_grep "does not support" err
|
||||
'
|
||||
|
||||
test_expect_success 'setup for checking fancy rename following' '
|
||||
|
|
@ -793,9 +778,9 @@ test_expect_success '-L with -S suppresses non-matching commits' '
|
|||
test_cmp expect actual
|
||||
'
|
||||
|
||||
test_expect_success '--full-diff is not yet supported with -L' '
|
||||
test_expect_success '--full-diff is not supported with -L' '
|
||||
test_must_fail git log -L1,24:b.c --full-diff 2>err &&
|
||||
test_grep "does not yet support" err
|
||||
test_grep "does not support" err
|
||||
'
|
||||
|
||||
test_expect_success '-L --oneline has no extra blank line before diff' '
|
||||
|
|
@ -806,6 +791,113 @@ test_expect_success '-L --oneline has no extra blank line before diff' '
|
|||
test_grep "^diff --git" line2
|
||||
'
|
||||
|
||||
test_expect_success 'setup for -L stat tests' '
|
||||
git checkout --orphan stat-range &&
|
||||
git reset --hard &&
|
||||
cat >file.c <<-\EOF &&
|
||||
int func1()
|
||||
{
|
||||
return F1;
|
||||
}
|
||||
|
||||
int tracked_fn()
|
||||
{
|
||||
return F2;
|
||||
}
|
||||
EOF
|
||||
git add file.c &&
|
||||
test_tick &&
|
||||
git commit -m "Add func1() and tracked_fn()" &&
|
||||
|
||||
# Modify both functions so whole-file stats (2 added, 2 deleted)
|
||||
# differ from the tracked range of tracked_fn (1 and 1).
|
||||
sed -e "s/F1/F1 + 1/" -e "s/F2/F2 + 2/" file.c >tmp &&
|
||||
mv tmp file.c &&
|
||||
git commit -a -m "Modify both functions"
|
||||
'
|
||||
|
||||
test_expect_success '-L --numstat limits counts to the tracked range' '
|
||||
git log -L:tracked_fn:file.c --numstat --format=%s >actual &&
|
||||
cat >expect <<-\EOF &&
|
||||
Modify both functions
|
||||
|
||||
1 1 file.c
|
||||
Add func1() and tracked_fn()
|
||||
|
||||
4 0 file.c
|
||||
EOF
|
||||
test_cmp expect actual
|
||||
'
|
||||
|
||||
test_expect_success '-L --stat and --shortstat limit counts to the tracked range' '
|
||||
git log -L:tracked_fn:file.c --stat --format=%s -1 >actual &&
|
||||
cat >expect <<-\EOF &&
|
||||
Modify both functions
|
||||
|
||||
file.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
EOF
|
||||
test_cmp expect actual &&
|
||||
|
||||
git log -L:tracked_fn:file.c --shortstat --format=%s -1 >actual &&
|
||||
cat >expect <<-\EOF &&
|
||||
Modify both functions
|
||||
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
EOF
|
||||
test_cmp expect actual
|
||||
'
|
||||
|
||||
test_expect_success '--numstat across renames and multiple commits' '
|
||||
# parallel-change carries the tracked function f across an a.c -> b.c
|
||||
# rename and a merge of two parallel histories.
|
||||
git checkout parallel-change &&
|
||||
git log -M -L ":f:b.c" --format= --numstat >actual &&
|
||||
cat >expect <<-\EOF &&
|
||||
1 1 b.c
|
||||
1 1 a.c
|
||||
1 1 a.c
|
||||
1 1 a.c
|
||||
1 0 a.c
|
||||
13 0 a.c
|
||||
EOF
|
||||
test_cmp expect actual
|
||||
'
|
||||
|
||||
test_expect_success '-L multiple ranges with --numstat excludes untracked change' '
|
||||
git checkout --orphan multi-range &&
|
||||
git reset --hard &&
|
||||
cat >m.c <<-\EOF &&
|
||||
int tracked_func1()
|
||||
{
|
||||
return F1;
|
||||
}
|
||||
|
||||
int tracked_func2()
|
||||
{
|
||||
return F2;
|
||||
}
|
||||
|
||||
int func3()
|
||||
{
|
||||
return F3;
|
||||
}
|
||||
EOF
|
||||
git add m.c &&
|
||||
test_tick &&
|
||||
git commit -m "add m.c" &&
|
||||
sed -e "s/F1/F1 + 1/" -e "s/F2/F2 + 2/" -e "s/F3/F3 + 3/" m.c >tmp &&
|
||||
mv tmp m.c &&
|
||||
git commit -a -m "Modify all three functions" &&
|
||||
git log -L:tracked_func1:m.c -L:tracked_func2:m.c --numstat --format=%s -1 >actual &&
|
||||
cat >expect <<-\EOF &&
|
||||
Modify all three functions
|
||||
|
||||
2 2 m.c
|
||||
EOF
|
||||
test_cmp expect actual
|
||||
'
|
||||
|
||||
test_expect_success '--summary shows new file on root commit' '
|
||||
git checkout parent-oids &&
|
||||
git log -L:func2:file.c --summary --format= >actual &&
|
||||
|
|
|
|||
Loading…
Reference in New Issue