blame: Notice a wholesale incorporation of an existing file.
[gitweb.git] / builtin-branch.c
index 2d8d61b453ede72b8d0319cb192f9f06a024d8c0..7408285050a0f41a33d31c73e79c2fdefe567593 100644 (file)
@@ -12,7 +12,7 @@
 #include "builtin.h"
 
 static const char builtin_branch_usage[] =
-  "git-branch [-r] (-d | -D) <branchname> | [-l] [-f] <branchname> [<start-point>] | (-m | -M) [<oldbranch>] <newbranch> | [--color | --no-color] [-r | -a] [-v [--abbrev=<length>]]";
+  "git-branch [-r] (-d | -D) <branchname> | [--track | --no-track] [-l] [-f] <branchname> [<start-point>] | (-m | -M) [<oldbranch>] <newbranch> | [--color | --no-color] [-r | -a] [-v [--abbrev=<length> | --no-abbrev]]";
 
 #define REF_UNKNOWN_TYPE    0x00
 #define REF_LOCAL_BRANCH    0x01
@@ -22,6 +22,8 @@ static const char builtin_branch_usage[] =
 static const char *head;
 static unsigned char head_sha1[20];
 
+static int branch_track_remotes;
+
 static int branch_use_color;
 static char branch_colors[][COLOR_MAXLEN] = {
        "\033[m",       /* reset */
@@ -59,11 +61,14 @@ int git_branch_config(const char *var, const char *value)
                branch_use_color = git_config_colorbool(var, value);
                return 0;
        }
-       if (!strncmp(var, "color.branch.", 13)) {
+       if (!prefixcmp(var, "color.branch.")) {
                int slot = parse_branch_color_slot(var, 13);
                color_parse(value, var, branch_colors[slot]);
                return 0;
        }
+       if (!strcmp(var, "branch.autosetupmerge"))
+               branch_track_remotes = git_config_bool(var, value);
+
        return git_default_config(var, value);
 }
 
@@ -134,7 +139,7 @@ static int delete_branches(int argc, const char **argv, int force, int kinds)
                 */
 
                if (!force &&
-                   !in_merge_bases(rev, head_rev)) {
+                   !in_merge_bases(rev, &head_rev, 1)) {
                        error("The branch '%s' is not a strict subset of "
                                "your current HEAD.\n"
                                "If you are sure you want to delete it, "
@@ -178,13 +183,13 @@ static int append_ref(const char *refname, const unsigned char *sha1, int flags,
        int len;
 
        /* Detect kind */
-       if (!strncmp(refname, "refs/heads/", 11)) {
+       if (!prefixcmp(refname, "refs/heads/")) {
                kind = REF_LOCAL_BRANCH;
                refname += 11;
-       } else if (!strncmp(refname, "refs/remotes/", 13)) {
+       } else if (!prefixcmp(refname, "refs/remotes/")) {
                kind = REF_REMOTE_BRANCH;
                refname += 13;
-       } else if (!strncmp(refname, "refs/tags/", 10)) {
+       } else if (!prefixcmp(refname, "refs/tags/")) {
                kind = REF_TAG;
                refname += 10;
        }
@@ -289,12 +294,13 @@ static void print_ref_list(int kinds, int detached, int verbose, int abbrev)
        detached = (detached && (kinds & REF_LOCAL_BRANCH));
        if (detached) {
                struct ref_item item;
-               item.name = "(no branch)";
+               item.name = xstrdup("(no branch)");
                item.kind = REF_LOCAL_BRANCH;
                hashcpy(item.sha1, head_sha1);
                if (strlen(item.name) > ref_list.maxwidth)
                              ref_list.maxwidth = strlen(item.name);
                print_ref_item(&item, ref_list.maxwidth, verbose, abbrev, 1);
+               free(item.name);
        }
 
        for (i = 0; i < ref_list.index; i++) {
@@ -308,14 +314,119 @@ static void print_ref_list(int kinds, int detached, int verbose, int abbrev)
        free_ref_list(&ref_list);
 }
 
+static char *config_repo;
+static char *config_remote;
+static const char *start_ref;
+static int start_len;
+static int base_len;
+
+static int get_remote_branch_name(const char *value)
+{
+       const char *colon;
+       const char *end;
+
+       if (*value == '+')
+               value++;
+
+       colon = strchr(value, ':');
+       if (!colon)
+               return 0;
+
+       end = value + strlen(value);
+
+       /* Try an exact match first.  */
+       if (!strcmp(colon + 1, start_ref)) {
+               /* Truncate the value before the colon.  */
+               nfasprintf(&config_repo, "%.*s", colon - value, value);
+               return 1;
+       }
+
+       /* Try with a wildcard match now.  */
+       if (end - value > 2 && end[-2] == '/' && end[-1] == '*' &&
+           colon - value > 2 && colon[-2] == '/' && colon[-1] == '*' &&
+           (end - 2) - (colon + 1) == base_len &&
+           !strncmp(colon + 1, start_ref, base_len)) {
+               /* Replace the star with the remote branch name.  */
+               nfasprintf(&config_repo, "%.*s%s",
+                          (colon - 2) - value, value,
+                          start_ref + base_len);
+               return 1;
+       }
+
+       return 0;
+}
+
+static int get_remote_config(const char *key, const char *value)
+{
+       const char *var;
+       if (prefixcmp(key, "remote."))
+               return 0;
+
+       var = strrchr(key, '.');
+       if (var == key + 6)
+               return 0;
+
+       if (!strcmp(var, ".fetch") && get_remote_branch_name(value))
+               nfasprintf(&config_remote, "%.*s", var - (key + 7), key + 7);
+
+       return 0;
+}
+
+static void set_branch_merge(const char *name, const char *config_remote,
+                            const char *config_repo)
+{
+       char key[1024];
+       if (sizeof(key) <=
+           snprintf(key, sizeof(key), "branch.%s.remote", name))
+               die("what a long branch name you have!");
+       git_config_set(key, config_remote);
+
+       /*
+        * We do not have to check if we have enough space for
+        * the 'merge' key, since it's shorter than the
+        * previous 'remote' key, which we already checked.
+        */
+       snprintf(key, sizeof(key), "branch.%s.merge", name);
+       git_config_set(key, config_repo);
+}
+
+static void set_branch_defaults(const char *name, const char *real_ref)
+{
+       const char *slash = strrchr(real_ref, '/');
+
+       if (!slash)
+               return;
+
+       start_ref = real_ref;
+       start_len = strlen(real_ref);
+       base_len = slash - real_ref;
+       git_config(get_remote_config);
+       if (!config_repo && !config_remote &&
+           !prefixcmp(real_ref, "refs/heads/")) {
+               set_branch_merge(name, ".", real_ref);
+               printf("Branch %s set up to track local branch %s.\n",
+                      name, real_ref);
+       }
+
+       if (config_repo && config_remote) {
+               set_branch_merge(name, config_remote, config_repo);
+               printf("Branch %s set up to track remote branch %s.\n",
+                      name, real_ref);
+       }
+
+       if (config_repo)
+               free(config_repo);
+       if (config_remote)
+               free(config_remote);
+}
+
 static void create_branch(const char *name, const char *start_name,
-                         unsigned char *start_sha1,
-                         int force, int reflog)
+                         int force, int reflog, int track)
 {
        struct ref_lock *lock;
        struct commit *commit;
        unsigned char sha1[20];
-       char ref[PATH_MAX], msg[PATH_MAX + 20];
+       char *real_ref, ref[PATH_MAX], msg[PATH_MAX + 20];
        int forcing = 0;
 
        snprintf(ref, sizeof ref, "refs/heads/%s", name);
@@ -330,12 +441,23 @@ static void create_branch(const char *name, const char *start_name,
                forcing = 1;
        }
 
-       if (start_sha1)
-               /* detached HEAD */
-               hashcpy(sha1, start_sha1);
-       else if (get_sha1(start_name, sha1))
+       real_ref = NULL;
+       if (get_sha1(start_name, sha1))
                die("Not a valid object name: '%s'.", start_name);
 
+       switch (dwim_ref(start_name, strlen(start_name), sha1, &real_ref)) {
+       case 0:
+               /* Not branching from any existing branch */
+               real_ref = NULL;
+               break;
+       case 1:
+               /* Unique completion -- good */
+               break;
+       default:
+               die("Ambiguous object name: '%s'.", start_name);
+               break;
+       }
+
        if ((commit = lookup_commit_reference(sha1)) == NULL)
                die("Not a valid branch point: '%s'.", start_name);
        hashcpy(sha1, commit->object.sha1);
@@ -354,14 +476,24 @@ static void create_branch(const char *name, const char *start_name,
                snprintf(msg, sizeof msg, "branch: Created from %s",
                         start_name);
 
+       /* When branching off a remote branch, set up so that git-pull
+          automatically merges from there.  So far, this is only done for
+          remotes registered via .git/config.  */
+       if (real_ref && track)
+               set_branch_defaults(name, real_ref);
+
        if (write_ref_sha1(lock, sha1, msg) < 0)
                die("Failed to write ref: %s.", strerror(errno));
+
+       if (real_ref)
+               free(real_ref);
 }
 
 static void rename_branch(const char *oldname, const char *newname, int force)
 {
        char oldref[PATH_MAX], newref[PATH_MAX], logmsg[PATH_MAX*2 + 100];
        unsigned char sha1[20];
+       char oldsection[PATH_MAX], newsection[PATH_MAX];
 
        if (!oldname)
                die("cannot rename the current branch while not on any.");
@@ -390,6 +522,11 @@ static void rename_branch(const char *oldname, const char *newname, int force)
        /* no need to pass logmsg here as HEAD didn't really move */
        if (!strcmp(oldname, head) && create_symref("HEAD", newref, NULL))
                die("Branch renamed to %s, but HEAD is not updated!", newname);
+
+       snprintf(oldsection, sizeof(oldsection), "branch.%s", oldref + 11);
+       snprintf(newsection, sizeof(newsection), "branch.%s", newref + 11);
+       if (git_config_rename_section(oldsection, newsection) < 0)
+               die("Branch is renamed, but update of config-file failed");
 }
 
 int cmd_branch(int argc, const char **argv, const char *prefix)
@@ -397,11 +534,12 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
        int delete = 0, force_delete = 0, force_create = 0;
        int rename = 0, force_rename = 0;
        int verbose = 0, abbrev = DEFAULT_ABBREV, detached = 0;
-       int reflog = 0;
+       int reflog = 0, track;
        int kinds = REF_LOCAL_BRANCH;
        int i;
 
        git_config(git_branch_config);
+       track = branch_track_remotes;
 
        for (i = 1; i < argc; i++) {
                const char *arg = argv[i];
@@ -412,6 +550,14 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
                        i++;
                        break;
                }
+               if (!strcmp(arg, "--track")) {
+                       track = 1;
+                       continue;
+               }
+               if (!strcmp(arg, "--no-track")) {
+                       track = 0;
+                       continue;
+               }
                if (!strcmp(arg, "-d")) {
                        delete = 1;
                        continue;
@@ -446,8 +592,16 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
                        reflog = 1;
                        continue;
                }
-               if (!strncmp(arg, "--abbrev=", 9)) {
-                       abbrev = atoi(arg+9);
+               if (!prefixcmp(arg, "--no-abbrev")) {
+                       abbrev = 0;
+                       continue;
+               }
+               if (!prefixcmp(arg, "--abbrev=")) {
+                       abbrev = strtoul(arg + 9, NULL, 10);
+                       if (abbrev < MINIMUM_ABBREV)
+                               abbrev = MINIMUM_ABBREV;
+                       else if (abbrev > 40)
+                               abbrev = 40;
                        continue;
                }
                if (!strcmp(arg, "-v")) {
@@ -476,7 +630,7 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
                detached = 1;
        }
        else {
-               if (strncmp(head, "refs/heads/", 11))
+               if (prefixcmp(head, "refs/heads/"))
                        die("HEAD not found below refs/heads!");
                head += 11;
        }
@@ -489,10 +643,9 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
                rename_branch(head, argv[i], force_rename);
        else if (rename && (i == argc - 2))
                rename_branch(argv[i], argv[i + 1], force_rename);
-       else if (i == argc - 1)
-               create_branch(argv[i], head, head_sha1, force_create, reflog);
-       else if (i == argc - 2)
-               create_branch(argv[i], argv[i+1], NULL, force_create, reflog);
+       else if (i == argc - 1 || i == argc - 2)
+               create_branch(argv[i], (i == argc - 2) ? argv[i+1] : head,
+                             force_create, reflog, track);
        else
                usage(builtin_branch_usage);