git-add --intent-to-add (-N)
[gitweb.git] / builtin-remote.c
index db12668cfeb87ca405e7b24f54b11505a701f83c..01945a8651c9a42f19fba850036ed2a1339675f1 100644 (file)
@@ -2,7 +2,7 @@
 #include "parse-options.h"
 #include "transport.h"
 #include "remote.h"
-#include "path-list.h"
+#include "string-list.h"
 #include "strbuf.h"
 #include "run-command.h"
 #include "refs.h"
@@ -31,11 +31,11 @@ static inline int postfixcmp(const char *string, const char *postfix)
 
 static int opt_parse_track(const struct option *opt, const char *arg, int not)
 {
-       struct path_list *list = opt->value;
+       struct string_list *list = opt->value;
        if (not)
-               path_list_clear(list, 0);
+               string_list_clear(list, 0);
        else
-               path_list_append(arg, list);
+               string_list_append(arg, list);
        return 0;
 }
 
@@ -51,7 +51,7 @@ static int fetch_remote(const char *name)
 static int add(int argc, const char **argv)
 {
        int fetch = 0, mirror = 0;
-       struct path_list track = { NULL, 0, 0 };
+       struct string_list track = { NULL, 0, 0 };
        const char *master = NULL;
        struct remote *remote;
        struct strbuf buf, buf2;
@@ -96,18 +96,18 @@ static int add(int argc, const char **argv)
        strbuf_addf(&buf, "remote.%s.fetch", name);
 
        if (track.nr == 0)
-               path_list_append("*", &track);
+               string_list_append("*", &track);
        for (i = 0; i < track.nr; i++) {
-               struct path_list_item *item = track.items + i;
+               struct string_list_item *item = track.items + i;
 
                strbuf_reset(&buf2);
                strbuf_addch(&buf2, '+');
                if (mirror)
                        strbuf_addf(&buf2, "refs/%s:refs/%s",
-                                       item->path, item->path);
+                                       item->string, item->string);
                else
                        strbuf_addf(&buf2, "refs/heads/%s:refs/remotes/%s/%s",
-                                       item->path, name, item->path);
+                                       item->string, name, item->string);
                if (git_config_set_multivar(buf.buf, buf2.buf, "^$", 0))
                        return 1;
        }
@@ -115,7 +115,7 @@ static int add(int argc, const char **argv)
        if (mirror) {
                strbuf_reset(&buf);
                strbuf_addf(&buf, "remote.%s.mirror", name);
-               if (git_config_set(buf.buf, "yes"))
+               if (git_config_set(buf.buf, "true"))
                        return 1;
        }
 
@@ -135,17 +135,17 @@ static int add(int argc, const char **argv)
 
        strbuf_release(&buf);
        strbuf_release(&buf2);
-       path_list_clear(&track, 0);
+       string_list_clear(&track, 0);
 
        return 0;
 }
 
 struct branch_info {
        char *remote;
-       struct path_list merge;
+       struct string_list merge;
 };
 
-static struct path_list branch_list;
+static struct string_list branch_list;
 
 static const char *abbrev_ref(const char *name, const char *prefix)
 {
@@ -160,7 +160,7 @@ static int config_read_branches(const char *key, const char *value, void *cb)
 {
        if (!prefixcmp(key, "branch.")) {
                char *name;
-               struct path_list_item *item;
+               struct string_list_item *item;
                struct branch_info *info;
                enum { REMOTE, MERGE } type;
 
@@ -174,7 +174,7 @@ static int config_read_branches(const char *key, const char *value, void *cb)
                } else
                        return 0;
 
-               item = path_list_insert(name, &branch_list);
+               item = string_list_insert(name, &branch_list);
 
                if (!item->util)
                        item->util = xcalloc(sizeof(struct branch_info), 1);
@@ -189,11 +189,11 @@ static int config_read_branches(const char *key, const char *value, void *cb)
                        while (space) {
                                char *merge;
                                merge = xstrndup(value, space - value);
-                               path_list_append(merge, &info->merge);
+                               string_list_append(merge, &info->merge);
                                value = abbrev_branch(space + 1);
                                space = strchr(value, ' ');
                        }
-                       path_list_append(xstrdup(value), &info->merge);
+                       string_list_append(xstrdup(value), &info->merge);
                }
        }
        return 0;
@@ -204,12 +204,12 @@ static void read_branches(void)
        if (branch_list.nr)
                return;
        git_config(config_read_branches, NULL);
-       sort_path_list(&branch_list);
+       sort_string_list(&branch_list);
 }
 
 struct ref_states {
        struct remote *remote;
-       struct path_list new, stale, tracked;
+       struct string_list new, stale, tracked;
 };
 
 static int handle_one_branch(const char *refname,
@@ -221,16 +221,16 @@ static int handle_one_branch(const char *refname,
        memset(&refspec, 0, sizeof(refspec));
        refspec.dst = (char *)refname;
        if (!remote_find_tracking(states->remote, &refspec)) {
-               struct path_list_item *item;
+               struct string_list_item *item;
                const char *name = abbrev_branch(refspec.src);
                /* symbolic refs pointing nowhere were handled already */
                if ((flags & REF_ISSYMREF) ||
-                               unsorted_path_list_has_path(&states->tracked,
+                               unsorted_string_list_has_string(&states->tracked,
                                        name) ||
-                               unsorted_path_list_has_path(&states->new,
+                               unsorted_string_list_has_string(&states->new,
                                        name))
                        return 0;
-               item = path_list_append(name, &states->stale);
+               item = string_list_append(name, &states->stale);
                item->util = xstrdup(refname);
        }
        return 0;
@@ -246,9 +246,9 @@ static int get_ref_states(const struct ref *ref, struct ref_states *states)
                        die("Could not get fetch map for refspec %s",
                                states->remote->fetch_refspec[i]);
 
-       states->new.strdup_paths = states->tracked.strdup_paths = 1;
+       states->new.strdup_strings = states->tracked.strdup_strings = 1;
        for (ref = fetch_map; ref; ref = ref->next) {
-               struct path_list *target = &states->tracked;
+               struct string_list *target = &states->tracked;
                unsigned char sha1[20];
                void *util = NULL;
 
@@ -259,12 +259,12 @@ static int get_ref_states(const struct ref *ref, struct ref_states *states)
                        if (hashcmp(sha1, ref->new_sha1))
                                util = &states;
                }
-               path_list_append(abbrev_branch(ref->name), target)->util = util;
+               string_list_append(abbrev_branch(ref->name), target)->util = util;
        }
        free_refs(fetch_map);
 
        for_each_ref(handle_one_branch, states);
-       sort_path_list(&states->stale);
+       sort_string_list(&states->stale);
 
        return 0;
 }
@@ -296,7 +296,7 @@ static int add_known_remote(struct remote *remote, void *cb_data)
 
 struct branches_for_remote {
        struct remote *remote;
-       struct path_list *branches;
+       struct string_list *branches;
        struct known_remotes *keep;
 };
 
@@ -305,7 +305,7 @@ static int add_branch_for_removal(const char *refname,
 {
        struct branches_for_remote *branches = cb_data;
        struct refspec refspec;
-       struct path_list_item *item;
+       struct string_list_item *item;
        struct known_remote *kr;
 
        memset(&refspec, 0, sizeof(refspec));
@@ -325,19 +325,19 @@ static int add_branch_for_removal(const char *refname,
        if (flags & REF_ISSYMREF)
                return unlink(git_path(refname));
 
-       item = path_list_append(refname, branches->branches);
+       item = string_list_append(refname, branches->branches);
        item->util = xmalloc(20);
        hashcpy(item->util, sha1);
 
        return 0;
 }
 
-static int remove_branches(struct path_list *branches)
+static int remove_branches(struct string_list *branches)
 {
        int i, result = 0;
        for (i = 0; i < branches->nr; i++) {
-               struct path_list_item *item = branches->items + i;
-               const char *refname = item->path;
+               struct string_list_item *item = branches->items + i;
+               const char *refname = item->string;
                unsigned char *sha1 = item->util;
 
                if (delete_ref(refname, sha1))
@@ -354,7 +354,7 @@ static int rm(int argc, const char **argv)
        struct remote *remote;
        struct strbuf buf;
        struct known_remotes known_remotes = { NULL, NULL };
-       struct path_list branches = { NULL, 0, 0, 1 };
+       struct string_list branches = { NULL, 0, 0, 1 };
        struct branches_for_remote cb_data = { NULL, &branches, &known_remotes };
        int i;
 
@@ -375,14 +375,14 @@ static int rm(int argc, const char **argv)
 
        read_branches();
        for (i = 0; i < branch_list.nr; i++) {
-               struct path_list_item *item = branch_list.items + i;
+               struct string_list_item *item = branch_list.items + i;
                struct branch_info *info = item->util;
                if (info->remote && !strcmp(info->remote, remote->name)) {
                        const char *keys[] = { "remote", "merge", NULL }, **k;
                        for (k = keys; *k; k++) {
                                strbuf_reset(&buf);
                                strbuf_addf(&buf, "branch.%s.%s",
-                                               item->path, *k);
+                                               item->string, *k);
                                if (git_config_set(buf.buf, NULL)) {
                                        strbuf_release(&buf);
                                        return -1;
@@ -402,12 +402,12 @@ static int rm(int argc, const char **argv)
 
        if (!i)
                i = remove_branches(&branches);
-       path_list_clear(&branches, 1);
+       string_list_clear(&branches, 1);
 
        return i;
 }
 
-static void show_list(const char *title, struct path_list *list)
+static void show_list(const char *title, struct string_list *list)
 {
        int i;
 
@@ -417,7 +417,7 @@ static void show_list(const char *title, struct path_list *list)
        printf(title, list->nr > 1 ? "es" : "");
        printf("\n    ");
        for (i = 0; i < list->nr; i++)
-               printf("%s%s", i ? " " : "", list->items[i].path);
+               printf("%s%s", i ? " " : "", list->items[i].string);
        printf("\n");
 }
 
@@ -455,7 +455,7 @@ static int append_ref_to_tracked_list(const char *refname,
        memset(&refspec, 0, sizeof(refspec));
        refspec.dst = (char *)refname;
        if (!remote_find_tracking(states->remote, &refspec))
-               path_list_append(abbrev_branch(refspec.src), &states->tracked);
+               string_list_append(abbrev_branch(refspec.src), &states->tracked);
 
        return 0;
 }
@@ -487,7 +487,7 @@ static int show(int argc, const char **argv)
                                states.remote->url[0] : "(no URL)");
 
                for (i = 0; i < branch_list.nr; i++) {
-                       struct path_list_item *branch = branch_list.items + i;
+                       struct string_list_item *branch = branch_list.items + i;
                        struct branch_info *info = branch->util;
                        int j;
 
@@ -496,9 +496,9 @@ static int show(int argc, const char **argv)
                        printf("  Remote branch%s merged with 'git pull' "
                                "while on branch %s\n   ",
                                info->merge.nr > 1 ? "es" : "",
-                               branch->path);
+                               branch->string);
                        for (j = 0; j < info->merge.nr; j++)
-                               printf(" %s", info->merge.items[j].path);
+                               printf(" %s", info->merge.items[j].string);
                        printf("\n");
                }
 
@@ -531,9 +531,9 @@ static int show(int argc, const char **argv)
                }
 
                /* NEEDSWORK: free remote */
-               path_list_clear(&states.new, 0);
-               path_list_clear(&states.stale, 0);
-               path_list_clear(&states.tracked, 0);
+               string_list_clear(&states.new, 0);
+               string_list_clear(&states.stale, 0);
+               string_list_clear(&states.tracked, 0);
        }
 
        return result;
@@ -579,9 +579,9 @@ static int prune(int argc, const char **argv)
                }
 
                /* NEEDSWORK: free remote */
-               path_list_clear(&states.new, 0);
-               path_list_clear(&states.stale, 0);
-               path_list_clear(&states.tracked, 0);
+               string_list_clear(&states.new, 0);
+               string_list_clear(&states.stale, 0);
+               string_list_clear(&states.tracked, 0);
        }
 
        return result;
@@ -589,15 +589,15 @@ static int prune(int argc, const char **argv)
 
 static int get_one_remote_for_update(struct remote *remote, void *priv)
 {
-       struct path_list *list = priv;
+       struct string_list *list = priv;
        if (!remote->skip_default_update)
-               path_list_append(xstrdup(remote->name), list);
+               string_list_append(xstrdup(remote->name), list);
        return 0;
 }
 
 struct remote_group {
        const char *name;
-       struct path_list *list;
+       struct string_list *list;
 } remote_group;
 
 static int get_remote_group(const char *key, const char *value, void *cb)
@@ -608,7 +608,7 @@ static int get_remote_group(const char *key, const char *value, void *cb)
                int space = strcspn(value, " \t\n");
                while (*value) {
                        if (space > 1)
-                               path_list_append(xstrndup(value, space),
+                               string_list_append(xstrndup(value, space),
                                                remote_group.list);
                        value += space + (value[space] != '\0');
                        space = strcspn(value, " \t\n");
@@ -621,7 +621,7 @@ static int get_remote_group(const char *key, const char *value, void *cb)
 static int update(int argc, const char **argv)
 {
        int i, result = 0;
-       struct path_list list = { NULL, 0, 0, 0 };
+       struct string_list list = { NULL, 0, 0, 0 };
        static const char *default_argv[] = { NULL, "default", NULL };
 
        if (argc < 2) {
@@ -639,20 +639,20 @@ static int update(int argc, const char **argv)
                result = for_each_remote(get_one_remote_for_update, &list);
 
        for (i = 0; i < list.nr; i++)
-               result |= fetch_remote(list.items[i].path);
+               result |= fetch_remote(list.items[i].string);
 
        /* all names were strdup()ed or strndup()ed */
-       list.strdup_paths = 1;
-       path_list_clear(&list, 0);
+       list.strdup_strings = 1;
+       string_list_clear(&list, 0);
 
        return result;
 }
 
 static int get_one_entry(struct remote *remote, void *priv)
 {
-       struct path_list *list = priv;
+       struct string_list *list = priv;
 
-       path_list_append(remote->name, list)->util = remote->url_nr ?
+       string_list_append(remote->name, list)->util = remote->url_nr ?
                (void *)remote->url[0] : NULL;
        if (remote->url_nr > 1)
                warning("Remote %s has more than one URL", remote->name);
@@ -662,16 +662,16 @@ static int get_one_entry(struct remote *remote, void *priv)
 
 static int show_all(void)
 {
-       struct path_list list = { NULL, 0, 0 };
+       struct string_list list = { NULL, 0, 0 };
        int result = for_each_remote(get_one_entry, &list);
 
        if (!result) {
                int i;
 
-               sort_path_list(&list);
+               sort_string_list(&list);
                for (i = 0; i < list.nr; i++) {
-                       struct path_list_item *item = list.items + i;
-                       printf("%s%s%s\n", item->path,
+                       struct string_list_item *item = list.items + i;
+                       printf("%s%s%s\n", item->string,
                                verbose ? "\t" : "",
                                verbose && item->util ?
                                        (const char *)item->util : "");