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

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>

diff --git a/Documentation/rev-list-options.txt b/Documentation/rev-list-options.txt
index 73111bb0512476cb1d1786d65c416b7f4efd94cf..52bae31fcb7f741c34911d94a9253a2a546ee2c2 100644 (file)
--- a/Documentation/rev-list-options.txt
+++ b/Documentation/rev-list-options.txt
@@ -730,7 +730,10 @@ ifdef::git-rev-list[]
        Print a number stating how many commits would have been
        listed, and suppress all other output.  When used together
        with '--left-right', instead print the counts for left and
        Print a number stating how many commits would have been
        listed, and suppress all other output.  When used together
        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[]
 
 

diff --git a/builtin/rev-list.c b/builtin/rev-list.c
index 9bfb94201f298f5902c6da13b12f4ca539bb86ed..4be66998f6bcb998df094d0c434dfab6bbdcc8c7 100644 (file)
--- a/builtin/rev-list.c
+++ b/builtin/rev-list.c
@@ -55,7 +55,9 @@ static void show_commit(struct commit *commit, void *data)
        graph_show_commit(revs->graph);
 
        if (revs->count) {
        graph_show_commit(revs->graph);
 
        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++;
                else
                        revs->count_right++;
                        revs->count_left++;
                else
                        revs->count_right++;


@@ -406,8 +408,12 @@ int cmd_rev_list(int argc, const char **argv, const char *prefix)
                             &info);
 
        if (revs.count) {
                             &info);
 
        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
                        printf("%d\n", revs.count_left + revs.count_right);
        }
                else
                        printf("%d\n", revs.count_left + revs.count_right);
        }

diff --git a/revision.h b/revision.h
index 9fd8f3016fe8f935f176f57c615f72df8ba8d157..bca9947977c50d151b0fed90931ec52112e72bae 100644 (file)
--- a/revision.h
+++ b/revision.h
@@ -141,6 +141,7 @@ struct rev_info {
        /* commit counts */
        int count_left;
        int count_right;
        /* commit counts */
        int count_left;
        int count_right;

+       int count_same;

 };
 
 #define REV_TREE_SAME          0
 };
 
 #define REV_TREE_SAME          0

diff --git a/t/t6007-rev-list-cherry-pick-file.sh b/t/t6007-rev-list-cherry-pick-file.sh
index cacf3de6c9f31889fd8df0bc0cebbbc74e3525bd..28d4f6b259c1696435698cb3826c837c8eaf90e3 100755 (executable)
--- a/t/t6007-rev-list-cherry-pick-file.sh
+++ b/t/t6007-rev-list-cherry-pick-file.sh
@@ -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' '
        git symbolic-ref HEAD refs/heads/independent &&
        rm .git/index &&
 test_expect_success '--cherry-pick with independent, but identical branches' '
        git symbolic-ref HEAD refs/heads/independent &&
        rm .git/index &&