builtin-remote.c

   1 #include "cache.h"
   2 #include "parse-options.h"
   3 #include "transport.h"
   4 #include "remote.h"
   5 #include "string-list.h"
   6 #include "strbuf.h"
   7 #include "run-command.h"
   8 #include "refs.h"
   9
  10 static const char * const builtin_remote_usage[] = {
  11         "git remote [-v | --verbose]",
  12         "git remote add [-t <branch>] [-m <master>] [-f] [--mirror] <name> <url>",
  13         "git remote rename <old> <new>",
  14         "git remote rm <name>",
  15         "git remote set-head <name> [-a | -d | <branch>]",
  16         "git remote show [-n] <name>",
  17         "git remote prune [-n | --dry-run] <name>",
  18         "git remote [-v | --verbose] update [group]",
  19         NULL
  20 };
  21
  22 #define GET_REF_STATES (1<<0)
  23 #define GET_HEAD_NAMES (1<<1)
  24 #define GET_PUSH_REF_STATES (1<<2)
  25
  26 static int verbose;
  27
  28 static int show_all(void);
  29
  30 static inline int postfixcmp(const char *string, const char *postfix)
  31 {
  32         int len1 = strlen(string), len2 = strlen(postfix);
  33         if (len1 < len2)
  34                 return 1;
  35         return strcmp(string + len1 - len2, postfix);
  36 }
  37
  38 static int opt_parse_track(const struct option *opt, const char *arg, int not)
  39 {
  40         struct string_list *list = opt->value;
  41         if (not)
  42                 string_list_clear(list, 0);
  43         else
  44                 string_list_append(arg, list);
  45         return 0;
  46 }
  47
  48 static int fetch_remote(const char *name)
  49 {
  50         const char *argv[] = { "fetch", name, NULL, NULL };
  51         if (verbose) {
  52                 argv[1] = "-v";
  53                 argv[2] = name;
  54         }
  55         printf("Updating %s\n", name);
  56         if (run_command_v_opt(argv, RUN_GIT_CMD))
  57                 return error("Could not fetch %s", name);
  58         return 0;
  59 }
  60
  61 static int add(int argc, const char **argv)
  62 {
  63         int fetch = 0, mirror = 0;
  64         struct string_list track = { NULL, 0, 0 };
  65         const char *master = NULL;
  66         struct remote *remote;
  67         struct strbuf buf = STRBUF_INIT, buf2 = STRBUF_INIT;
  68         const char *name, *url;
  69         int i;
  70
  71         struct option options[] = {
  72                 OPT_GROUP("add specific options"),
  73                 OPT_BOOLEAN('f', "fetch", &fetch, "fetch the remote branches"),
  74                 OPT_CALLBACK('t', "track", &track, "branch",
  75                         "branch(es) to track", opt_parse_track),
  76                 OPT_STRING('m', "master", &master, "branch", "master branch"),
  77                 OPT_BOOLEAN(0, "mirror", &mirror, "no separate remotes"),
  78                 OPT_END()
  79         };
  80
  81         argc = parse_options(argc, argv, options, builtin_remote_usage, 0);
  82
  83         if (argc < 2)
  84                 usage_with_options(builtin_remote_usage, options);
  85
  86         name = argv[0];
  87         url = argv[1];
  88
  89         remote = remote_get(name);
  90         if (remote && (remote->url_nr > 1 || strcmp(name, remote->url[0]) ||
  91                         remote->fetch_refspec_nr))
  92                 die("remote %s already exists.", name);
  93
  94         strbuf_addf(&buf2, "refs/heads/test:refs/remotes/%s/test", name);
  95         if (!valid_fetch_refspec(buf2.buf))
  96                 die("'%s' is not a valid remote name", name);
  97
  98         strbuf_addf(&buf, "remote.%s.url", name);
  99         if (git_config_set(buf.buf, url))
 100                 return 1;
 101
 102         strbuf_reset(&buf);
 103         strbuf_addf(&buf, "remote.%s.fetch", name);
 104
 105         if (track.nr == 0)
 106                 string_list_append("*", &track);
 107         for (i = 0; i < track.nr; i++) {
 108                 struct string_list_item *item = track.items + i;
 109
 110                 strbuf_reset(&buf2);
 111                 strbuf_addch(&buf2, '+');
 112                 if (mirror)
 113                         strbuf_addf(&buf2, "refs/%s:refs/%s",
 114                                         item->string, item->string);
 115                 else
 116                         strbuf_addf(&buf2, "refs/heads/%s:refs/remotes/%s/%s",
 117                                         item->string, name, item->string);
 118                 if (git_config_set_multivar(buf.buf, buf2.buf, "^$", 0))
 119                         return 1;
 120         }
 121
 122         if (mirror) {
 123                 strbuf_reset(&buf);
 124                 strbuf_addf(&buf, "remote.%s.mirror", name);
 125                 if (git_config_set(buf.buf, "true"))
 126                         return 1;
 127         }
 128
 129         if (fetch && fetch_remote(name))
 130                 return 1;
 131
 132         if (master) {
 133                 strbuf_reset(&buf);
 134                 strbuf_addf(&buf, "refs/remotes/%s/HEAD", name);
 135
 136                 strbuf_reset(&buf2);
 137                 strbuf_addf(&buf2, "refs/remotes/%s/%s", name, master);
 138
 139                 if (create_symref(buf.buf, buf2.buf, "remote add"))
 140                         return error("Could not setup master '%s'", master);
 141         }
 142
 143         strbuf_release(&buf);
 144         strbuf_release(&buf2);
 145         string_list_clear(&track, 0);
 146
 147         return 0;
 148 }
 149
 150 struct branch_info {
 151         char *remote_name;
 152         struct string_list merge;
 153         int rebase;
 154 };
 155
 156 static struct string_list branch_list;
 157
 158 static const char *abbrev_ref(const char *name, const char *prefix)
 159 {
 160         const char *abbrev = skip_prefix(name, prefix);
 161         if (abbrev)
 162                 return abbrev;
 163         return name;
 164 }
 165 #define abbrev_branch(name) abbrev_ref((name), "refs/heads/")
 166
 167 static int config_read_branches(const char *key, const char *value, void *cb)
 168 {
 169         if (!prefixcmp(key, "branch.")) {
 170                 const char *orig_key = key;
 171                 char *name;
 172                 struct string_list_item *item;
 173                 struct branch_info *info;
 174                 enum { REMOTE, MERGE, REBASE } type;
 175
 176                 key += 7;
 177                 if (!postfixcmp(key, ".remote")) {
 178                         name = xstrndup(key, strlen(key) - 7);
 179                         type = REMOTE;
 180                 } else if (!postfixcmp(key, ".merge")) {
 181                         name = xstrndup(key, strlen(key) - 6);
 182                         type = MERGE;
 183                 } else if (!postfixcmp(key, ".rebase")) {
 184                         name = xstrndup(key, strlen(key) - 7);
 185                         type = REBASE;
 186                 } else
 187                         return 0;
 188
 189                 item = string_list_insert(name, &branch_list);
 190
 191                 if (!item->util)
 192                         item->util = xcalloc(sizeof(struct branch_info), 1);
 193                 info = item->util;
 194                 if (type == REMOTE) {
 195                         if (info->remote_name)
 196                                 warning("more than one %s", orig_key);
 197                         info->remote_name = xstrdup(value);
 198                 } else if (type == MERGE) {
 199                         char *space = strchr(value, ' ');
 200                         value = abbrev_branch(value);
 201                         while (space) {
 202                                 char *merge;
 203                                 merge = xstrndup(value, space - value);
 204                                 string_list_append(merge, &info->merge);
 205                                 value = abbrev_branch(space + 1);
 206                                 space = strchr(value, ' ');
 207                         }
 208                         string_list_append(xstrdup(value), &info->merge);
 209                 } else
 210                         info->rebase = git_config_bool(orig_key, value);
 211         }
 212         return 0;
 213 }
 214
 215 static void read_branches(void)
 216 {
 217         if (branch_list.nr)
 218                 return;
 219         git_config(config_read_branches, NULL);
 220 }
 221
 222 struct ref_states {
 223         struct remote *remote;
 224         struct string_list new, stale, tracked, heads, push;
 225         int queried;
 226 };
 227
 228 static int handle_one_branch(const char *refname,
 229         const unsigned char *sha1, int flags, void *cb_data)
 230 {
 231         struct ref_states *states = cb_data;
 232         struct refspec refspec;
 233
 234         memset(&refspec, 0, sizeof(refspec));
 235         refspec.dst = (char *)refname;
 236         if (!remote_find_tracking(states->remote, &refspec)) {
 237                 struct string_list_item *item;
 238                 const char *name = abbrev_branch(refspec.src);
 239                 /* symbolic refs pointing nowhere were handled already */
 240                 if ((flags & REF_ISSYMREF) ||
 241                     string_list_has_string(&states->tracked, name) ||
 242                     string_list_has_string(&states->new, name))
 243                         return 0;
 244                 item = string_list_append(name, &states->stale);
 245                 item->util = xstrdup(refname);
 246         }
 247         return 0;
 248 }
 249
 250 static int get_ref_states(const struct ref *remote_refs, struct ref_states *states)
 251 {
 252         struct ref *fetch_map = NULL, **tail = &fetch_map;
 253         struct ref *ref;
 254         int i;
 255
 256         for (i = 0; i < states->remote->fetch_refspec_nr; i++)
 257                 if (get_fetch_map(remote_refs, states->remote->fetch + i, &tail, 1))
 258                         die("Could not get fetch map for refspec %s",
 259                                 states->remote->fetch_refspec[i]);
 260
 261         states->new.strdup_strings = states->tracked.strdup_strings = 1;
 262         for (ref = fetch_map; ref; ref = ref->next) {
 263                 unsigned char sha1[20];
 264                 if (!ref->peer_ref || read_ref(ref->peer_ref->name, sha1))
 265                         string_list_append(abbrev_branch(ref->name), &states->new);
 266                 else
 267                         string_list_append(abbrev_branch(ref->name), &states->tracked);
 268         }
 269         free_refs(fetch_map);
 270
 271         sort_string_list(&states->new);
 272         sort_string_list(&states->tracked);
 273         for_each_ref(handle_one_branch, states);
 274         sort_string_list(&states->stale);
 275
 276         return 0;
 277 }
 278
 279 struct push_info {
 280         char *dest;
 281         int forced;
 282         enum {
 283                 PUSH_STATUS_CREATE = 0,
 284                 PUSH_STATUS_DELETE,
 285                 PUSH_STATUS_UPTODATE,
 286                 PUSH_STATUS_FASTFORWARD,
 287                 PUSH_STATUS_OUTOFDATE,
 288                 PUSH_STATUS_NOTQUERIED,
 289         } status;
 290 };
 291
 292 static int get_push_ref_states(const struct ref *remote_refs,
 293         struct ref_states *states)
 294 {
 295         struct remote *remote = states->remote;
 296         struct ref *ref, *local_refs, *push_map, **push_tail;
 297         if (remote->mirror)
 298                 return 0;
 299
 300         local_refs = get_local_heads();
 301         ref = push_map = copy_ref_list(remote_refs);
 302         while (ref->next)
 303                 ref = ref->next;
 304         push_tail = &ref->next;
 305
 306         match_refs(local_refs, push_map, &push_tail, remote->push_refspec_nr,
 307                    remote->push_refspec, MATCH_REFS_NONE);
 308
 309         states->push.strdup_strings = 1;
 310         for (ref = push_map; ref; ref = ref->next) {
 311                 struct string_list_item *item;
 312                 struct push_info *info;
 313
 314                 if (!ref->peer_ref)
 315                         continue;
 316                 hashcpy(ref->new_sha1, ref->peer_ref->new_sha1);
 317
 318                 item = string_list_append(abbrev_branch(ref->peer_ref->name),
 319                                           &states->push);
 320                 item->util = xcalloc(sizeof(struct push_info), 1);
 321                 info = item->util;
 322                 info->forced = ref->force;
 323                 info->dest = xstrdup(abbrev_branch(ref->name));
 324
 325                 if (is_null_sha1(ref->new_sha1)) {
 326                         info->status = PUSH_STATUS_DELETE;
 327                 } else if (!hashcmp(ref->old_sha1, ref->new_sha1))
 328                         info->status = PUSH_STATUS_UPTODATE;
 329                 else if (is_null_sha1(ref->old_sha1))
 330                         info->status = PUSH_STATUS_CREATE;
 331                 else if (has_sha1_file(ref->old_sha1) &&
 332                          ref_newer(ref->new_sha1, ref->old_sha1))
 333                         info->status = PUSH_STATUS_FASTFORWARD;
 334                 else
 335                         info->status = PUSH_STATUS_OUTOFDATE;
 336         }
 337         free_refs(local_refs);
 338         free_refs(push_map);
 339         return 0;
 340 }
 341
 342 static int get_push_ref_states_noquery(struct ref_states *states)
 343 {
 344         int i;
 345         struct remote *remote = states->remote;
 346         struct string_list_item *item;
 347         struct push_info *info;
 348
 349         if (remote->mirror)
 350                 return 0;
 351
 352         states->push.strdup_strings = 1;
 353         if (!remote->push_refspec_nr) {
 354                 item = string_list_append("(matching)", &states->push);
 355                 info = item->util = xcalloc(sizeof(struct push_info), 1);
 356                 info->status = PUSH_STATUS_NOTQUERIED;
 357                 info->dest = xstrdup(item->string);
 358         }
 359         for (i = 0; i < remote->push_refspec_nr; i++) {
 360                 struct refspec *spec = remote->push + i;
 361                 if (spec->matching)
 362                         item = string_list_append("(matching)", &states->push);
 363                 else if (strlen(spec->src))
 364                         item = string_list_append(spec->src, &states->push);
 365                 else
 366                         item = string_list_append("(delete)", &states->push);
 367
 368                 info = item->util = xcalloc(sizeof(struct push_info), 1);
 369                 info->forced = spec->force;
 370                 info->status = PUSH_STATUS_NOTQUERIED;
 371                 info->dest = xstrdup(spec->dst ? spec->dst : item->string);
 372         }
 373         return 0;
 374 }
 375
 376 static int get_head_names(const struct ref *remote_refs, struct ref_states *states)
 377 {
 378         struct ref *ref, *matches;
 379         struct ref *fetch_map = NULL, **fetch_map_tail = &fetch_map;
 380         struct refspec refspec;
 381
 382         refspec.force = 0;
 383         refspec.pattern = 1;
 384         refspec.src = refspec.dst = "refs/heads/*";
 385         states->heads.strdup_strings = 1;
 386         get_fetch_map(remote_refs, &refspec, &fetch_map_tail, 0);
 387         matches = guess_remote_head(find_ref_by_name(remote_refs, "HEAD"),
 388                                     fetch_map, 1);
 389         for(ref = matches; ref; ref = ref->next)
 390                 string_list_append(abbrev_branch(ref->name), &states->heads);
 391
 392         free_refs(fetch_map);
 393         free_refs(matches);
 394
 395         return 0;
 396 }
 397
 398 struct known_remote {
 399         struct known_remote *next;
 400         struct remote *remote;
 401 };
 402
 403 struct known_remotes {
 404         struct remote *to_delete;
 405         struct known_remote *list;
 406 };
 407
 408 static int add_known_remote(struct remote *remote, void *cb_data)
 409 {
 410         struct known_remotes *all = cb_data;
 411         struct known_remote *r;
 412
 413         if (!strcmp(all->to_delete->name, remote->name))
 414                 return 0;
 415
 416         r = xmalloc(sizeof(*r));
 417         r->remote = remote;
 418         r->next = all->list;
 419         all->list = r;
 420         return 0;
 421 }
 422
 423 struct branches_for_remote {
 424         struct remote *remote;
 425         struct string_list *branches, *skipped;
 426         struct known_remotes *keep;
 427 };
 428
 429 static int add_branch_for_removal(const char *refname,
 430         const unsigned char *sha1, int flags, void *cb_data)
 431 {
 432         struct branches_for_remote *branches = cb_data;
 433         struct refspec refspec;
 434         struct string_list_item *item;
 435         struct known_remote *kr;
 436
 437         memset(&refspec, 0, sizeof(refspec));
 438         refspec.dst = (char *)refname;
 439         if (remote_find_tracking(branches->remote, &refspec))
 440                 return 0;
 441
 442         /* don't delete a branch if another remote also uses it */
 443         for (kr = branches->keep->list; kr; kr = kr->next) {
 444                 memset(&refspec, 0, sizeof(refspec));
 445                 refspec.dst = (char *)refname;
 446                 if (!remote_find_tracking(kr->remote, &refspec))
 447                         return 0;
 448         }
 449
 450         /* don't delete non-remote refs */
 451         if (prefixcmp(refname, "refs/remotes")) {
 452                 /* advise user how to delete local branches */
 453                 if (!prefixcmp(refname, "refs/heads/"))
 454                         string_list_append(abbrev_branch(refname),
 455                                            branches->skipped);
 456                 /* silently skip over other non-remote refs */
 457                 return 0;
 458         }
 459
 460         /* make sure that symrefs are deleted */
 461         if (flags & REF_ISSYMREF)
 462                 return unlink(git_path("%s", refname));
 463
 464         item = string_list_append(refname, branches->branches);
 465         item->util = xmalloc(20);
 466         hashcpy(item->util, sha1);
 467
 468         return 0;
 469 }
 470
 471 struct rename_info {
 472         const char *old;
 473         const char *new;
 474         struct string_list *remote_branches;
 475 };
 476
 477 static int read_remote_branches(const char *refname,
 478         const unsigned char *sha1, int flags, void *cb_data)
 479 {
 480         struct rename_info *rename = cb_data;
 481         struct strbuf buf = STRBUF_INIT;
 482         struct string_list_item *item;
 483         int flag;
 484         unsigned char orig_sha1[20];
 485         const char *symref;
 486
 487         strbuf_addf(&buf, "refs/remotes/%s", rename->old);
 488         if(!prefixcmp(refname, buf.buf)) {
 489                 item = string_list_append(xstrdup(refname), rename->remote_branches);
 490                 symref = resolve_ref(refname, orig_sha1, 1, &flag);
 491                 if (flag & REF_ISSYMREF)
 492                         item->util = xstrdup(symref);
 493                 else
 494                         item->util = NULL;
 495         }
 496
 497         return 0;
 498 }
 499
 500 static int migrate_file(struct remote *remote)
 501 {
 502         struct strbuf buf = STRBUF_INIT;
 503         int i;
 504         char *path = NULL;
 505
 506         strbuf_addf(&buf, "remote.%s.url", remote->name);
 507         for (i = 0; i < remote->url_nr; i++)
 508                 if (git_config_set_multivar(buf.buf, remote->url[i], "^$", 0))
 509                         return error("Could not append '%s' to '%s'",
 510                                         remote->url[i], buf.buf);
 511         strbuf_reset(&buf);
 512         strbuf_addf(&buf, "remote.%s.push", remote->name);
 513         for (i = 0; i < remote->push_refspec_nr; i++)
 514                 if (git_config_set_multivar(buf.buf, remote->push_refspec[i], "^$", 0))
 515                         return error("Could not append '%s' to '%s'",
 516                                         remote->push_refspec[i], buf.buf);
 517         strbuf_reset(&buf);
 518         strbuf_addf(&buf, "remote.%s.fetch", remote->name);
 519         for (i = 0; i < remote->fetch_refspec_nr; i++)
 520                 if (git_config_set_multivar(buf.buf, remote->fetch_refspec[i], "^$", 0))
 521                         return error("Could not append '%s' to '%s'",
 522                                         remote->fetch_refspec[i], buf.buf);
 523         if (remote->origin == REMOTE_REMOTES)
 524                 path = git_path("remotes/%s", remote->name);
 525         else if (remote->origin == REMOTE_BRANCHES)
 526                 path = git_path("branches/%s", remote->name);
 527         if (path && unlink(path))
 528                 warning("failed to remove '%s'", path);
 529         return 0;
 530 }
 531
 532 static int mv(int argc, const char **argv)
 533 {
 534         struct option options[] = {
 535                 OPT_END()
 536         };
 537         struct remote *oldremote, *newremote;
 538         struct strbuf buf = STRBUF_INIT, buf2 = STRBUF_INIT, buf3 = STRBUF_INIT;
 539         struct string_list remote_branches = { NULL, 0, 0, 0 };
 540         struct rename_info rename;
 541         int i;
 542
 543         if (argc != 3)
 544                 usage_with_options(builtin_remote_usage, options);
 545
 546         rename.old = argv[1];
 547         rename.new = argv[2];
 548         rename.remote_branches = &remote_branches;
 549
 550         oldremote = remote_get(rename.old);
 551         if (!oldremote)
 552                 die("No such remote: %s", rename.old);
 553
 554         if (!strcmp(rename.old, rename.new) && oldremote->origin != REMOTE_CONFIG)
 555                 return migrate_file(oldremote);
 556
 557         newremote = remote_get(rename.new);
 558         if (newremote && (newremote->url_nr > 1 || newremote->fetch_refspec_nr))
 559                 die("remote %s already exists.", rename.new);
 560
 561         strbuf_addf(&buf, "refs/heads/test:refs/remotes/%s/test", rename.new);
 562         if (!valid_fetch_refspec(buf.buf))
 563                 die("'%s' is not a valid remote name", rename.new);
 564
 565         strbuf_reset(&buf);
 566         strbuf_addf(&buf, "remote.%s", rename.old);
 567         strbuf_addf(&buf2, "remote.%s", rename.new);
 568         if (git_config_rename_section(buf.buf, buf2.buf) < 1)
 569                 return error("Could not rename config section '%s' to '%s'",
 570                                 buf.buf, buf2.buf);
 571
 572         strbuf_reset(&buf);
 573         strbuf_addf(&buf, "remote.%s.fetch", rename.new);
 574         if (git_config_set_multivar(buf.buf, NULL, NULL, 1))
 575                 return error("Could not remove config section '%s'", buf.buf);
 576         for (i = 0; i < oldremote->fetch_refspec_nr; i++) {
 577                 char *ptr;
 578
 579                 strbuf_reset(&buf2);
 580                 strbuf_addstr(&buf2, oldremote->fetch_refspec[i]);
 581                 ptr = strstr(buf2.buf, rename.old);
 582                 if (ptr)
 583                         strbuf_splice(&buf2, ptr-buf2.buf, strlen(rename.old),
 584                                         rename.new, strlen(rename.new));
 585                 if (git_config_set_multivar(buf.buf, buf2.buf, "^$", 0))
 586                         return error("Could not append '%s'", buf.buf);
 587         }
 588
 589         read_branches();
 590         for (i = 0; i < branch_list.nr; i++) {
 591                 struct string_list_item *item = branch_list.items + i;
 592                 struct branch_info *info = item->util;
 593                 if (info->remote_name && !strcmp(info->remote_name, rename.old)) {
 594                         strbuf_reset(&buf);
 595                         strbuf_addf(&buf, "branch.%s.remote", item->string);
 596                         if (git_config_set(buf.buf, rename.new)) {
 597                                 return error("Could not set '%s'", buf.buf);
 598                         }
 599                 }
 600         }
 601
 602         /*
 603          * First remove symrefs, then rename the rest, finally create
 604          * the new symrefs.
 605          */
 606         for_each_ref(read_remote_branches, &rename);
 607         for (i = 0; i < remote_branches.nr; i++) {
 608                 struct string_list_item *item = remote_branches.items + i;
 609                 int flag = 0;
 610                 unsigned char sha1[20];
 611
 612                 resolve_ref(item->string, sha1, 1, &flag);
 613                 if (!(flag & REF_ISSYMREF))
 614                         continue;
 615                 if (delete_ref(item->string, NULL, REF_NODEREF))
 616                         die("deleting '%s' failed", item->string);
 617         }
 618         for (i = 0; i < remote_branches.nr; i++) {
 619                 struct string_list_item *item = remote_branches.items + i;
 620
 621                 if (item->util)
 622                         continue;
 623                 strbuf_reset(&buf);
 624                 strbuf_addstr(&buf, item->string);
 625                 strbuf_splice(&buf, strlen("refs/remotes/"), strlen(rename.old),
 626                                 rename.new, strlen(rename.new));
 627                 strbuf_reset(&buf2);
 628                 strbuf_addf(&buf2, "remote: renamed %s to %s",
 629                                 item->string, buf.buf);
 630                 if (rename_ref(item->string, buf.buf, buf2.buf))
 631                         die("renaming '%s' failed", item->string);
 632         }
 633         for (i = 0; i < remote_branches.nr; i++) {
 634                 struct string_list_item *item = remote_branches.items + i;
 635
 636                 if (!item->util)
 637                         continue;
 638                 strbuf_reset(&buf);
 639                 strbuf_addstr(&buf, item->string);
 640                 strbuf_splice(&buf, strlen("refs/remotes/"), strlen(rename.old),
 641                                 rename.new, strlen(rename.new));
 642                 strbuf_reset(&buf2);
 643                 strbuf_addstr(&buf2, item->util);
 644                 strbuf_splice(&buf2, strlen("refs/remotes/"), strlen(rename.old),
 645                                 rename.new, strlen(rename.new));
 646                 strbuf_reset(&buf3);
 647                 strbuf_addf(&buf3, "remote: renamed %s to %s",
 648                                 item->string, buf.buf);
 649                 if (create_symref(buf.buf, buf2.buf, buf3.buf))
 650                         die("creating '%s' failed", buf.buf);
 651         }
 652         return 0;
 653 }
 654
 655 static int remove_branches(struct string_list *branches)
 656 {
 657         int i, result = 0;
 658         for (i = 0; i < branches->nr; i++) {
 659                 struct string_list_item *item = branches->items + i;
 660                 const char *refname = item->string;
 661                 unsigned char *sha1 = item->util;
 662
 663                 if (delete_ref(refname, sha1, 0))
 664                         result |= error("Could not remove branch %s", refname);
 665         }
 666         return result;
 667 }
 668
 669 static int rm(int argc, const char **argv)
 670 {
 671         struct option options[] = {
 672                 OPT_END()
 673         };
 674         struct remote *remote;
 675         struct strbuf buf = STRBUF_INIT;
 676         struct known_remotes known_remotes = { NULL, NULL };
 677         struct string_list branches = { NULL, 0, 0, 1 };
 678         struct string_list skipped = { NULL, 0, 0, 1 };
 679         struct branches_for_remote cb_data = {
 680                 NULL, &branches, &skipped, &known_remotes
 681         };
 682         int i, result;
 683
 684         if (argc != 2)
 685                 usage_with_options(builtin_remote_usage, options);
 686
 687         remote = remote_get(argv[1]);
 688         if (!remote)
 689                 die("No such remote: %s", argv[1]);
 690
 691         known_remotes.to_delete = remote;
 692         for_each_remote(add_known_remote, &known_remotes);
 693
 694         strbuf_addf(&buf, "remote.%s", remote->name);
 695         if (git_config_rename_section(buf.buf, NULL) < 1)
 696                 return error("Could not remove config section '%s'", buf.buf);
 697
 698         read_branches();
 699         for (i = 0; i < branch_list.nr; i++) {
 700                 struct string_list_item *item = branch_list.items + i;
 701                 struct branch_info *info = item->util;
 702                 if (info->remote_name && !strcmp(info->remote_name, remote->name)) {
 703                         const char *keys[] = { "remote", "merge", NULL }, **k;
 704                         for (k = keys; *k; k++) {
 705                                 strbuf_reset(&buf);
 706                                 strbuf_addf(&buf, "branch.%s.%s",
 707                                                 item->string, *k);
 708                                 if (git_config_set(buf.buf, NULL)) {
 709                                         strbuf_release(&buf);
 710                                         return -1;
 711                                 }
 712                         }
 713                 }
 714         }
 715
 716         /*
 717          * We cannot just pass a function to for_each_ref() which deletes
 718          * the branches one by one, since for_each_ref() relies on cached
 719          * refs, which are invalidated when deleting a branch.
 720          */
 721         cb_data.remote = remote;
 722         result = for_each_ref(add_branch_for_removal, &cb_data);
 723         strbuf_release(&buf);
 724
 725         if (!result)
 726                 result = remove_branches(&branches);
 727         string_list_clear(&branches, 1);
 728
 729         if (skipped.nr) {
 730                 fprintf(stderr, skipped.nr == 1 ?
 731                         "Note: A non-remote branch was not removed; "
 732                         "to delete it, use:\n" :
 733                         "Note: Non-remote branches were not removed; "
 734                         "to delete them, use:\n");
 735                 for (i = 0; i < skipped.nr; i++)
 736                         fprintf(stderr, "  git branch -d %s\n",
 737                                 skipped.items[i].string);
 738         }
 739         string_list_clear(&skipped, 0);
 740
 741         return result;
 742 }
 743
 744 void clear_push_info(void *util, const char *string)
 745 {
 746         struct push_info *info = util;
 747         free(info->dest);
 748         free(info);
 749 }
 750
 751 static void free_remote_ref_states(struct ref_states *states)
 752 {
 753         string_list_clear(&states->new, 0);
 754         string_list_clear(&states->stale, 0);
 755         string_list_clear(&states->tracked, 0);
 756         string_list_clear(&states->heads, 0);
 757         string_list_clear_func(&states->push, clear_push_info);
 758 }
 759
 760 static int append_ref_to_tracked_list(const char *refname,
 761         const unsigned char *sha1, int flags, void *cb_data)
 762 {
 763         struct ref_states *states = cb_data;
 764         struct refspec refspec;
 765
 766         if (flags & REF_ISSYMREF)
 767                 return 0;
 768
 769         memset(&refspec, 0, sizeof(refspec));
 770         refspec.dst = (char *)refname;
 771         if (!remote_find_tracking(states->remote, &refspec))
 772                 string_list_append(abbrev_branch(refspec.src), &states->tracked);
 773
 774         return 0;
 775 }
 776
 777 static int get_remote_ref_states(const char *name,
 778                                  struct ref_states *states,
 779                                  int query)
 780 {
 781         struct transport *transport;
 782         const struct ref *remote_refs;
 783
 784         states->remote = remote_get(name);
 785         if (!states->remote)
 786                 return error("No such remote: %s", name);
 787
 788         read_branches();
 789
 790         if (query) {
 791                 transport = transport_get(NULL, states->remote->url_nr > 0 ?
 792                         states->remote->url[0] : NULL);
 793                 remote_refs = transport_get_remote_refs(transport);
 794                 transport_disconnect(transport);
 795
 796                 states->queried = 1;
 797                 if (query & GET_REF_STATES)
 798                         get_ref_states(remote_refs, states);
 799                 if (query & GET_HEAD_NAMES)
 800                         get_head_names(remote_refs, states);
 801                 if (query & GET_PUSH_REF_STATES)
 802                         get_push_ref_states(remote_refs, states);
 803         } else {
 804                 for_each_ref(append_ref_to_tracked_list, states);
 805                 sort_string_list(&states->tracked);
 806                 get_push_ref_states_noquery(states);
 807         }
 808
 809         return 0;
 810 }
 811
 812 struct show_info {
 813         struct string_list *list;
 814         struct ref_states *states;
 815         int width, width2;
 816         int any_rebase;
 817 };
 818
 819 int add_remote_to_show_info(struct string_list_item *item, void *cb_data)
 820 {
 821         struct show_info *info = cb_data;
 822         int n = strlen(item->string);
 823         if (n > info->width)
 824                 info->width = n;
 825         string_list_insert(item->string, info->list);
 826         return 0;
 827 }
 828
 829 int show_remote_info_item(struct string_list_item *item, void *cb_data)
 830 {
 831         struct show_info *info = cb_data;
 832         struct ref_states *states = info->states;
 833         const char *name = item->string;
 834
 835         if (states->queried) {
 836                 const char *fmt = "%s";
 837                 const char *arg = "";
 838                 if (string_list_has_string(&states->new, name)) {
 839                         fmt = " new (next fetch will store in remotes/%s)";
 840                         arg = states->remote->name;
 841                 } else if (string_list_has_string(&states->tracked, name))
 842                         arg = " tracked";
 843                 else if (string_list_has_string(&states->stale, name))
 844                         arg = " stale (use 'git remote prune' to remove)";
 845                 else
 846                         arg = " ???";
 847                 printf("    %-*s", info->width, name);
 848                 printf(fmt, arg);
 849                 printf("\n");
 850         } else
 851                 printf("    %s\n", name);
 852
 853         return 0;
 854 }
 855
 856 int add_local_to_show_info(struct string_list_item *branch_item, void *cb_data)
 857 {
 858         struct show_info *show_info = cb_data;
 859         struct ref_states *states = show_info->states;
 860         struct branch_info *branch_info = branch_item->util;
 861         struct string_list_item *item;
 862         int n;
 863
 864         if (!branch_info->merge.nr || !branch_info->remote_name ||
 865             strcmp(states->remote->name, branch_info->remote_name))
 866                 return 0;
 867         if ((n = strlen(branch_item->string)) > show_info->width)
 868                 show_info->width = n;
 869         if (branch_info->rebase)
 870                 show_info->any_rebase = 1;
 871
 872         item = string_list_insert(branch_item->string, show_info->list);
 873         item->util = branch_info;
 874
 875         return 0;
 876 }
 877
 878 int show_local_info_item(struct string_list_item *item, void *cb_data)
 879 {
 880         struct show_info *show_info = cb_data;
 881         struct branch_info *branch_info = item->util;
 882         struct string_list *merge = &branch_info->merge;
 883         const char *also;
 884         int i;
 885
 886         if (branch_info->rebase && branch_info->merge.nr > 1) {
 887                 error("invalid branch.%s.merge; cannot rebase onto > 1 branch",
 888                         item->string);
 889                 return 0;
 890         }
 891
 892         printf("    %-*s ", show_info->width, item->string);
 893         if (branch_info->rebase) {
 894                 printf("rebases onto remote %s\n", merge->items[0].string);
 895                 return 0;
 896         } else if (show_info->any_rebase) {
 897                 printf(" merges with remote %s\n", merge->items[0].string);
 898                 also = "    and with remote";
 899         } else {
 900                 printf("merges with remote %s\n", merge->items[0].string);
 901                 also = "   and with remote";
 902         }
 903         for (i = 1; i < merge->nr; i++)
 904                 printf("    %-*s %s %s\n", show_info->width, "", also,
 905                        merge->items[i].string);
 906
 907         return 0;
 908 }
 909
 910 int add_push_to_show_info(struct string_list_item *push_item, void *cb_data)
 911 {
 912         struct show_info *show_info = cb_data;
 913         struct push_info *push_info = push_item->util;
 914         struct string_list_item *item;
 915         int n;
 916         if ((n = strlen(push_item->string)) > show_info->width)
 917                 show_info->width = n;
 918         if ((n = strlen(push_info->dest)) > show_info->width2)
 919                 show_info->width2 = n;
 920         item = string_list_append(push_item->string, show_info->list);
 921         item->util = push_item->util;
 922         return 0;
 923 }
 924
 925 /*
 926  * Sorting comparison for a string list that has push_info
 927  * structs in its util field
 928  */
 929 static int cmp_string_with_push(const void *va, const void *vb)
 930 {
 931         const struct string_list_item *a = va;
 932         const struct string_list_item *b = vb;
 933         const struct push_info *a_push = a->util;
 934         const struct push_info *b_push = b->util;
 935         int cmp = strcmp(a->string, b->string);
 936         return cmp ? cmp : strcmp(a_push->dest, b_push->dest);
 937 }
 938
 939 int show_push_info_item(struct string_list_item *item, void *cb_data)
 940 {
 941         struct show_info *show_info = cb_data;
 942         struct push_info *push_info = item->util;
 943         char *src = item->string, *status = NULL;
 944
 945         switch (push_info->status) {
 946         case PUSH_STATUS_CREATE:
 947                 status = "create";
 948                 break;
 949         case PUSH_STATUS_DELETE:
 950                 status = "delete";
 951                 src = "(none)";
 952                 break;
 953         case PUSH_STATUS_UPTODATE:
 954                 status = "up to date";
 955                 break;
 956         case PUSH_STATUS_FASTFORWARD:
 957                 status = "fast forwardable";
 958                 break;
 959         case PUSH_STATUS_OUTOFDATE:
 960                 status = "local out of date";
 961                 break;
 962         case PUSH_STATUS_NOTQUERIED:
 963                 break;
 964         }
 965         if (status)
 966                 printf("    %-*s %s to %-*s (%s)\n", show_info->width, src,
 967                         push_info->forced ? "forces" : "pushes",
 968                         show_info->width2, push_info->dest, status);
 969         else
 970                 printf("    %-*s %s to %s\n", show_info->width, src,
 971                         push_info->forced ? "forces" : "pushes",
 972                         push_info->dest);
 973         return 0;
 974 }
 975
 976 static int show(int argc, const char **argv)
 977 {
 978         int no_query = 0, result = 0, query_flag = 0;
 979         struct option options[] = {
 980                 OPT_GROUP("show specific options"),
 981                 OPT_BOOLEAN('n', NULL, &no_query, "do not query remotes"),
 982                 OPT_END()
 983         };
 984         struct ref_states states;
 985         struct string_list info_list = { NULL, 0, 0, 0 };
 986         struct show_info info;
 987
 988         argc = parse_options(argc, argv, options, builtin_remote_usage, 0);
 989
 990         if (argc < 1)
 991                 return show_all();
 992
 993         if (!no_query)
 994                 query_flag = (GET_REF_STATES | GET_HEAD_NAMES | GET_PUSH_REF_STATES);
 995
 996         memset(&states, 0, sizeof(states));
 997         memset(&info, 0, sizeof(info));
 998         info.states = &states;
 999         info.list = &info_list;
1000         for (; argc; argc--, argv++) {
1001                 int i;
1002
1003                 get_remote_ref_states(*argv, &states, query_flag);
1004
1005                 printf("* remote %s\n  URL: %s\n", *argv,
1006                         states.remote->url_nr > 0 ?
1007                                 states.remote->url[0] : "(no URL)");
1008                 if (no_query)
1009                         printf("  HEAD branch: (not queried)\n");
1010                 else if (!states.heads.nr)
1011                         printf("  HEAD branch: (unknown)\n");
1012                 else if (states.heads.nr == 1)
1013                         printf("  HEAD branch: %s\n", states.heads.items[0].string);
1014                 else {
1015                         printf("  HEAD branch (remote HEAD is ambiguous,"
1016                                " may be one of the following):\n");
1017                         for (i = 0; i < states.heads.nr; i++)
1018                                 printf("    %s\n", states.heads.items[i].string);
1019                 }
1020
1021                 /* remote branch info */
1022                 info.width = 0;
1023                 for_each_string_list(add_remote_to_show_info, &states.new, &info);
1024                 for_each_string_list(add_remote_to_show_info, &states.tracked, &info);
1025                 for_each_string_list(add_remote_to_show_info, &states.stale, &info);
1026                 if (info.list->nr)
1027                         printf("  Remote branch%s:%s\n",
1028                                info.list->nr > 1 ? "es" : "",
1029                                 no_query ? " (status not queried)" : "");
1030                 for_each_string_list(show_remote_info_item, info.list, &info);
1031                 string_list_clear(info.list, 0);
1032
1033                 /* git pull info */
1034                 info.width = 0;
1035                 info.any_rebase = 0;
1036                 for_each_string_list(add_local_to_show_info, &branch_list, &info);
1037                 if (info.list->nr)
1038                         printf("  Local branch%s configured for 'git pull':\n",
1039                                info.list->nr > 1 ? "es" : "");
1040                 for_each_string_list(show_local_info_item, info.list, &info);
1041                 string_list_clear(info.list, 0);
1042
1043                 /* git push info */
1044                 if (states.remote->mirror)
1045                         printf("  Local refs will be mirrored by 'git push'\n");
1046
1047                 info.width = info.width2 = 0;
1048                 for_each_string_list(add_push_to_show_info, &states.push, &info);
1049                 qsort(info.list->items, info.list->nr,
1050                         sizeof(*info.list->items), cmp_string_with_push);
1051                 if (info.list->nr)
1052                         printf("  Local ref%s configured for 'git push'%s:\n",
1053                                 info.list->nr > 1 ? "s" : "",
1054                                 no_query ? " (status not queried)" : "");
1055                 for_each_string_list(show_push_info_item, info.list, &info);
1056                 string_list_clear(info.list, 0);
1057
1058                 free_remote_ref_states(&states);
1059         }
1060
1061         return result;
1062 }
1063
1064 static int set_head(int argc, const char **argv)
1065 {
1066         int i, opt_a = 0, opt_d = 0, result = 0;
1067         struct strbuf buf = STRBUF_INIT, buf2 = STRBUF_INIT;
1068         char *head_name = NULL;
1069
1070         struct option options[] = {
1071                 OPT_GROUP("set-head specific options"),
1072                 OPT_BOOLEAN('a', "auto", &opt_a,
1073                             "set refs/remotes/<name>/HEAD according to remote"),
1074                 OPT_BOOLEAN('d', "delete", &opt_d,
1075                             "delete refs/remotes/<name>/HEAD"),
1076                 OPT_END()
1077         };
1078         argc = parse_options(argc, argv, options, builtin_remote_usage, 0);
1079         if (argc)
1080                 strbuf_addf(&buf, "refs/remotes/%s/HEAD", argv[0]);
1081
1082         if (!opt_a && !opt_d && argc == 2) {
1083                 head_name = xstrdup(argv[1]);
1084         } else if (opt_a && !opt_d && argc == 1) {
1085                 struct ref_states states;
1086                 memset(&states, 0, sizeof(states));
1087                 get_remote_ref_states(argv[0], &states, GET_HEAD_NAMES);
1088                 if (!states.heads.nr)
1089                         result |= error("Cannot determine remote HEAD");
1090                 else if (states.heads.nr > 1) {
1091                         result |= error("Multiple remote HEAD branches. "
1092                                         "Please choose one explicitly with:");
1093                         for (i = 0; i < states.heads.nr; i++)
1094                                 fprintf(stderr, "  git remote set-head %s %s\n",
1095                                         argv[0], states.heads.items[i].string);
1096                 } else
1097                         head_name = xstrdup(states.heads.items[0].string);
1098                 free_remote_ref_states(&states);
1099         } else if (opt_d && !opt_a && argc == 1) {
1100                 if (delete_ref(buf.buf, NULL, REF_NODEREF))
1101                         result |= error("Could not delete %s", buf.buf);
1102         } else
1103                 usage_with_options(builtin_remote_usage, options);
1104
1105         if (head_name) {
1106                 unsigned char sha1[20];
1107                 strbuf_addf(&buf2, "refs/remotes/%s/%s", argv[0], head_name);
1108                 /* make sure it's valid */
1109                 if (!resolve_ref(buf2.buf, sha1, 1, NULL))
1110                         result |= error("Not a valid ref: %s", buf2.buf);
1111                 else if (create_symref(buf.buf, buf2.buf, "remote set-head"))
1112                         result |= error("Could not setup %s", buf.buf);
1113                 if (opt_a)
1114                         printf("%s/HEAD set to %s\n", argv[0], head_name);
1115                 free(head_name);
1116         }
1117
1118         strbuf_release(&buf);
1119         strbuf_release(&buf2);
1120         return result;
1121 }
1122
1123 static int prune(int argc, const char **argv)
1124 {
1125         int dry_run = 0, result = 0;
1126         struct option options[] = {
1127                 OPT_GROUP("prune specific options"),
1128                 OPT__DRY_RUN(&dry_run),
1129                 OPT_END()
1130         };
1131         struct ref_states states;
1132         const char *dangling_msg;
1133
1134         argc = parse_options(argc, argv, options, builtin_remote_usage, 0);
1135
1136         if (argc < 1)
1137                 usage_with_options(builtin_remote_usage, options);
1138
1139         dangling_msg = (dry_run
1140                         ? " %s will become dangling!\n"
1141                         : " %s has become dangling!\n");
1142
1143         memset(&states, 0, sizeof(states));
1144         for (; argc; argc--, argv++) {
1145                 int i;
1146
1147                 get_remote_ref_states(*argv, &states, GET_REF_STATES);
1148
1149                 if (states.stale.nr) {
1150                         printf("Pruning %s\n", *argv);
1151                         printf("URL: %s\n",
1152                                states.remote->url_nr
1153                                ? states.remote->url[0]
1154                                : "(no URL)");
1155                 }
1156
1157                 for (i = 0; i < states.stale.nr; i++) {
1158                         const char *refname = states.stale.items[i].util;
1159
1160                         if (!dry_run)
1161                                 result |= delete_ref(refname, NULL, 0);
1162
1163                         printf(" * [%s] %s\n", dry_run ? "would prune" : "pruned",
1164                                abbrev_ref(refname, "refs/remotes/"));
1165                         warn_dangling_symref(dangling_msg, refname);
1166                 }
1167
1168                 free_remote_ref_states(&states);
1169         }
1170
1171         return result;
1172 }
1173
1174 static int get_one_remote_for_update(struct remote *remote, void *priv)
1175 {
1176         struct string_list *list = priv;
1177         if (!remote->skip_default_update)
1178                 string_list_append(remote->name, list);
1179         return 0;
1180 }
1181
1182 struct remote_group {
1183         const char *name;
1184         struct string_list *list;
1185 } remote_group;
1186
1187 static int get_remote_group(const char *key, const char *value, void *cb)
1188 {
1189         if (!prefixcmp(key, "remotes.") &&
1190                         !strcmp(key + 8, remote_group.name)) {
1191                 /* split list by white space */
1192                 int space = strcspn(value, " \t\n");
1193                 while (*value) {
1194                         if (space > 1)
1195                                 string_list_append(xstrndup(value, space),
1196                                                 remote_group.list);
1197                         value += space + (value[space] != '\0');
1198                         space = strcspn(value, " \t\n");
1199                 }
1200         }
1201
1202         return 0;
1203 }
1204
1205 static int update(int argc, const char **argv)
1206 {
1207         int i, result = 0;
1208         struct string_list list = { NULL, 0, 0, 0 };
1209         static const char *default_argv[] = { NULL, "default", NULL };
1210
1211         if (argc < 2) {
1212                 argc = 2;
1213                 argv = default_argv;
1214         }
1215
1216         remote_group.list = &list;
1217         for (i = 1; i < argc; i++) {
1218                 remote_group.name = argv[i];
1219                 result = git_config(get_remote_group, NULL);
1220         }
1221
1222         if (!result && !list.nr  && argc == 2 && !strcmp(argv[1], "default"))
1223                 result = for_each_remote(get_one_remote_for_update, &list);
1224
1225         for (i = 0; i < list.nr; i++)
1226                 result |= fetch_remote(list.items[i].string);
1227
1228         /* all names were strdup()ed or strndup()ed */
1229         list.strdup_strings = 1;
1230         string_list_clear(&list, 0);
1231
1232         return result;
1233 }
1234
1235 static int get_one_entry(struct remote *remote, void *priv)
1236 {
1237         struct string_list *list = priv;
1238
1239         if (remote->url_nr > 0) {
1240                 int i;
1241
1242                 for (i = 0; i < remote->url_nr; i++)
1243                         string_list_append(remote->name, list)->util = (void *)remote->url[i];
1244         } else
1245                 string_list_append(remote->name, list)->util = NULL;
1246
1247         return 0;
1248 }
1249
1250 static int show_all(void)
1251 {
1252         struct string_list list = { NULL, 0, 0 };
1253         int result = for_each_remote(get_one_entry, &list);
1254
1255         if (!result) {
1256                 int i;
1257
1258                 sort_string_list(&list);
1259                 for (i = 0; i < list.nr; i++) {
1260                         struct string_list_item *item = list.items + i;
1261                         if (verbose)
1262                                 printf("%s\t%s\n", item->string,
1263                                         item->util ? (const char *)item->util : "");
1264                         else {
1265                                 if (i && !strcmp((item - 1)->string, item->string))
1266                                         continue;
1267                                 printf("%s\n", item->string);
1268                         }
1269                 }
1270         }
1271         return result;
1272 }
1273
1274 int cmd_remote(int argc, const char **argv, const char *prefix)
1275 {
1276         struct option options[] = {
1277                 OPT__VERBOSE(&verbose),
1278                 OPT_END()
1279         };
1280         int result;
1281
1282         argc = parse_options(argc, argv, options, builtin_remote_usage,
1283                 PARSE_OPT_STOP_AT_NON_OPTION);
1284
1285         if (argc < 1)
1286                 result = show_all();
1287         else if (!strcmp(argv[0], "add"))
1288                 result = add(argc, argv);
1289         else if (!strcmp(argv[0], "rename"))
1290                 result = mv(argc, argv);
1291         else if (!strcmp(argv[0], "rm"))
1292                 result = rm(argc, argv);
1293         else if (!strcmp(argv[0], "set-head"))
1294                 result = set_head(argc, argv);
1295         else if (!strcmp(argv[0], "show"))
1296                 result = show(argc, argv);
1297         else if (!strcmp(argv[0], "prune"))
1298                 result = prune(argc, argv);
1299         else if (!strcmp(argv[0], "update"))
1300                 result = update(argc, argv);
1301         else {
1302                 error("Unknown subcommand: %s", argv[0]);
1303                 usage_with_options(builtin_remote_usage, options);
1304         }
1305
1306         return result ? 1 : 0;
1307 }