Merge branch 'lt/push' into next

diff --git a/show-branch.c b/show-branch.c
index f43c4064699fb86e31dba2737d232e70330944d0..24efb65e622d8dfe44db22e5bc23c9f8cc328109 100644 (file)
--- a/show-branch.c
+++ b/show-branch.c
@@ -5,7 +5,7 @@
 #include "refs.h"
 
 static const char show_branch_usage[] =
-"git-show-branch [--all] [--heads] [--tags] [--topo-order] [--more=count | --list | --independent | --merge-base ] [<refs>...]";
+"git-show-branch [--current] [--all] [--heads] [--tags] [--topo-order] [--more=count | --list | --independent | --merge-base ] [--topics] [<refs>...]";
 
 static int default_num = 0;
 static int default_alloc = 0;
@@ -258,8 +258,8 @@ static void show_one_commit(struct commit *commit, int no_name)
        char pretty[256], *cp;
        struct commit_name *name = commit->object.util;
        if (commit->object.parsed)
-               pretty_print_commit(CMIT_FMT_ONELINE, commit->buffer, ~0,
-                                   pretty, sizeof(pretty));
+               pretty_print_commit(CMIT_FMT_ONELINE, commit, ~0,
+                                   pretty, sizeof(pretty), 0);
        else
                strcpy(pretty, "(unavailable)");
        if (!strncmp(pretty, "[PATCH] ", 8))
@@ -435,12 +435,12 @@ static void snarf_refs(int head, int tag)
        }
 }
 
-static int rev_is_head(char *head_path, int headlen,
-                      char *name,
+static int rev_is_head(char *head_path, int headlen, char *name,
                       unsigned char *head_sha1, unsigned char *sha1)
 {
        int namelen;
-       if ((!head_path[0]) || memcmp(head_sha1, sha1, 20))
+       if ((!head_path[0]) ||
+           (head_sha1 && sha1 && memcmp(head_sha1, sha1, 20)))
                return 0;
        namelen = strlen(name);
        if ((headlen < namelen) ||
@@ -496,7 +496,7 @@ static void append_one_rev(const char *av)
                append_ref(av, revkey);
                return;
        }
-       if (strchr(av, '*') || strchr(av, '?')) {
+       if (strchr(av, '*') || strchr(av, '?') || strchr(av, '[')) {
                /* glob style match */
                int saved_matches = ref_name_cnt;
                match_ref_pattern = av;
@@ -535,6 +535,7 @@ int main(int ac, char **av)
        int num_rev, i, extra = 0;
        int all_heads = 0, all_tags = 0;
        int all_mask, all_revs;
+       int lifo = 1;
        char head_path[128];
        const char *head_path_p;
        int head_path_len;
@@ -544,10 +545,12 @@ int main(int ac, char **av)
        int no_name = 0;
        int sha1_name = 0;
        int shown_merge_point = 0;
-       int topo_order = 0;
+       int with_current_branch = 0;
+       int head_at = -1;
+       int topics = 0;
 
-       git_config(git_show_branch_config);
        setup_git_directory();
+       git_config(git_show_branch_config);
 
        /* If nothing is specified, try the default first */
        if (ac == 1 && default_num) {
@@ -573,6 +576,8 @@ int main(int ac, char **av)
                        extra = -1;
                else if (!strcmp(arg, "--no-name"))
                        no_name = 1;
+               else if (!strcmp(arg, "--current"))
+                       with_current_branch = 1;
                else if (!strcmp(arg, "--sha1-name"))
                        sha1_name = 1;
                else if (!strncmp(arg, "--more=", 7))
@@ -582,7 +587,11 @@ int main(int ac, char **av)
                else if (!strcmp(arg, "--independent"))
                        independent = 1;
                else if (!strcmp(arg, "--topo-order"))
-                       topo_order = 1;
+                       lifo = 1;
+               else if (!strcmp(arg, "--topics"))
+                       topics = 1;
+               else if (!strcmp(arg, "--date-order"))
+                       lifo = 0;
                else
                        usage(show_branch_usage);
                ac--; av++;
@@ -604,6 +613,34 @@ int main(int ac, char **av)
                ac--; av++;
        }
 
+       head_path_p = resolve_ref(git_path("HEAD"), head_sha1, 1);
+       if (head_path_p) {
+               head_path_len = strlen(head_path_p);
+               memcpy(head_path, head_path_p, head_path_len + 1);
+       }
+       else {
+               head_path_len = 0;
+               head_path[0] = 0;
+       }
+
+       if (with_current_branch && head_path_p) {
+               int has_head = 0;
+               for (i = 0; !has_head && i < ref_name_cnt; i++) {
+                       /* We are only interested in adding the branch
+                        * HEAD points at.
+                        */
+                       if (rev_is_head(head_path,
+                                       head_path_len,
+                                       ref_name[i],
+                                       head_sha1, NULL))
+                               has_head++;
+               }
+               if (!has_head) {
+                       int pfxlen = strlen(git_path("refs/heads/"));
+                       append_one_rev(head_path + pfxlen);
+               }
+       }
+
        if (!ref_name_cnt) {
                fprintf(stderr, "No revs to be shown.\n");
                exit(0);
@@ -639,16 +676,6 @@ int main(int ac, char **av)
        if (0 <= extra)
                join_revs(&list, &seen, num_rev, extra);
 
-       head_path_p = resolve_ref(git_path("HEAD"), head_sha1, 1);
-       if (head_path_p) {
-               head_path_len = strlen(head_path_p);
-               memcpy(head_path, head_path_p, head_path_len + 1);
-       }
-       else {
-               head_path_len = 0;
-               head_path[0] = 0;
-       }
-
        if (merge_base)
                return show_merge_base(seen, num_rev);
 
@@ -675,6 +702,8 @@ int main(int ac, char **av)
                        }
                        /* header lines never need name */
                        show_one_commit(rev[i], 1);
+                       if (is_head)
+                               head_at = i;
                }
                if (0 <= extra) {
                        for (i = 0; i < num_rev; i++)
@@ -686,8 +715,7 @@ int main(int ac, char **av)
                exit(0);
 
        /* Sort topologically */
-       if (topo_order)
-               sort_in_topological_order(&seen);
+       sort_in_topological_order(&seen, lifo);
 
        /* Give names to commits */
        if (!sha1_name && !no_name)
@@ -699,13 +727,29 @@ int main(int ac, char **av)
        while (seen) {
                struct commit *commit = pop_one_commit(&seen);
                int this_flag = commit->object.flags;
+               int is_merge_point = ((this_flag & all_revs) == all_revs);
 
-               shown_merge_point |= ((this_flag & all_revs) == all_revs);
+               shown_merge_point |= is_merge_point;
 
                if (1 < num_rev) {
-                       for (i = 0; i < num_rev; i++)
-                               putchar((this_flag & (1u << (i + REV_SHIFT)))
-                                       ? '+' : ' ');
+                       int is_merge = !!(commit->parents && commit->parents->next);
+                       if (topics &&
+                           !is_merge_point &&
+                           (this_flag & (1u << REV_SHIFT)))
+                               continue;
+
+                       for (i = 0; i < num_rev; i++) {
+                               int mark;
+                               if (!(this_flag & (1u << (i + REV_SHIFT))))
+                                       mark = ' ';
+                               else if (is_merge)
+                                       mark = '-';
+                               else if (i == head_at)
+                                       mark = '*';
+                               else
+                                       mark = '+';
+                               putchar(mark);
+                       }
                        putchar(' ');
                }
                show_one_commit(commit, no_name);