mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rev-list --count: separate count for --cherry-mark

Browse Source 
When --count is used with --cherry-mark, omit the patch equivalent
commits from the count for left and right commits and print the count of
equivalent commits separately.

Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Michael J Gruber
2011-04-26 10:24:29 +02:00
committed by Junio C Hamano
parent ec014eac0e
commit b388e14b89
4 changed files with 40 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Documentation/rev-list-options.txt
View File

@ -730,7 +730,10 @@ ifdef::git-rev-list[]
Print a number stating how many commits would have been Print a number stating how many commits would have been
listed, and suppress all other output. When used together listed, and suppress all other output. When used together
with '--left-right', instead print the counts for left and with '--left-right', instead print the counts for left and
right commits, separated by a tab. right commits, separated by a tab. When used together with
'--cherry-mark', omit patch equivalent commits from these
counts and print the count for equivalent commits separated
by a tab.
endif::git-rev-list[] endif::git-rev-list[]

10
builtin/rev-list.c
View File

@ -55,7 +55,9 @@ static void show_commit(struct commit *commit, void *data)
graph_show_commit(revs->graph); graph_show_commit(revs->graph);
if (revs->count) { if (revs->count) {
if (commit->object.flags & SYMMETRIC_LEFT) if (commit->object.flags & PATCHSAME)
revs->count_same++;
else if (commit->object.flags & SYMMETRIC_LEFT)
revs->count_left++; revs->count_left++;
else else
revs->count_right++; revs->count_right++;
@ -406,8 +408,12 @@ int cmd_rev_list(int argc, const char **argv, const char *prefix)
&info); &info);
if (revs.count) { if (revs.count) {
if (revs.left_right) if (revs.left_right && revs.cherry_mark)
printf("%d\t%d\t%d\n", revs.count_left, revs.count_right, revs.count_same);
else if (revs.left_right)
printf("%d\t%d\n", revs.count_left, revs.count_right); printf("%d\t%d\n", revs.count_left, revs.count_right);
else if (revs.cherry_mark)
printf("%d\t%d\n", revs.count_left + revs.count_right, revs.count_same);
else else
printf("%d\n", revs.count_left + revs.count_right); printf("%d\n", revs.count_left + revs.count_right);
} }

1
revision.h
View File

@ -141,6 +141,7 @@ struct rev_info {
/* commit counts */ /* commit counts */
int count_left; int count_left;
int count_right; int count_right;
int count_same;
}; };
#define REV_TREE_SAME 0 #define REV_TREE_SAME 0

27
t/t6007-rev-list-cherry-pick-file.sh
View File

@ -157,6 +157,33 @@ test_expect_success '--cherry' '
test_cmp actual.named expect test_cmp actual.named expect
' '
cat >expect <<EOF
1 1
EOF
test_expect_success '--cherry --count' '
git rev-list --cherry --count F...E -- bar > actual &&
test_cmp actual expect
'
cat >expect <<EOF
2 2
EOF
test_expect_success '--cherry-mark --count' '
git rev-list --cherry-mark --count F...E -- bar > actual &&
test_cmp actual expect
'
cat >expect <<EOF
1 1 2
EOF
test_expect_success '--cherry-mark --left-right --count' '
git rev-list --cherry-mark --left-right --count F...E -- bar > actual &&
test_cmp actual expect
'
test_expect_success '--cherry-pick with independent, but identical branches' ' test_expect_success '--cherry-pick with independent, but identical branches' '
git symbolic-ref HEAD refs/heads/independent && git symbolic-ref HEAD refs/heads/independent &&
rm .git/index && rm .git/index &&