send-pack.con commit Merge git://repo.or.cz/git-gui (d794d9e)
   1#include "cache.h"
   2#include "commit.h"
   3#include "tag.h"
   4#include "refs.h"
   5#include "pkt-line.h"
   6#include "run-command.h"
   7#include "remote.h"
   8
   9static const char send_pack_usage[] =
  10"git-send-pack [--all] [--dry-run] [--force] [--receive-pack=<git-receive-pack>] [--verbose] [--thin] [<host>:]<directory> [<ref>...]\n"
  11"  --all and explicit <ref> specification are mutually exclusive.";
  12static const char *receivepack = "git-receive-pack";
  13static int verbose;
  14static int send_all;
  15static int force_update;
  16static int use_thin_pack;
  17static int dry_run;
  18
  19/*
  20 * Make a pack stream and spit it out into file descriptor fd
  21 */
  22static int pack_objects(int fd, struct ref *refs)
  23{
  24        /*
  25         * The child becomes pack-objects --revs; we feed
  26         * the revision parameters to it via its stdin and
  27         * let its stdout go back to the other end.
  28         */
  29        const char *args[] = {
  30                "pack-objects",
  31                "--all-progress",
  32                "--revs",
  33                "--stdout",
  34                NULL,
  35                NULL,
  36        };
  37        struct child_process po;
  38
  39        if (use_thin_pack)
  40                args[4] = "--thin";
  41        memset(&po, 0, sizeof(po));
  42        po.argv = args;
  43        po.in = -1;
  44        po.out = fd;
  45        po.git_cmd = 1;
  46        if (start_command(&po))
  47                die("git-pack-objects failed (%s)", strerror(errno));
  48
  49        /*
  50         * We feed the pack-objects we just spawned with revision
  51         * parameters by writing to the pipe.
  52         */
  53        while (refs) {
  54                char buf[42];
  55
  56                if (!is_null_sha1(refs->old_sha1) &&
  57                    has_sha1_file(refs->old_sha1)) {
  58                        memcpy(buf + 1, sha1_to_hex(refs->old_sha1), 40);
  59                        buf[0] = '^';
  60                        buf[41] = '\n';
  61                        if (!write_or_whine(po.in, buf, 42,
  62                                                "send-pack: send refs"))
  63                                break;
  64                }
  65                if (!is_null_sha1(refs->new_sha1)) {
  66                        memcpy(buf, sha1_to_hex(refs->new_sha1), 40);
  67                        buf[40] = '\n';
  68                        if (!write_or_whine(po.in, buf, 41,
  69                                                "send-pack: send refs"))
  70                                break;
  71                }
  72                refs = refs->next;
  73        }
  74
  75        if (finish_command(&po))
  76                return error("pack-objects died with strange error");
  77        return 0;
  78}
  79
  80static void unmark_and_free(struct commit_list *list, unsigned int mark)
  81{
  82        while (list) {
  83                struct commit_list *temp = list;
  84                temp->item->object.flags &= ~mark;
  85                list = temp->next;
  86                free(temp);
  87        }
  88}
  89
  90static int ref_newer(const unsigned char *new_sha1,
  91                     const unsigned char *old_sha1)
  92{
  93        struct object *o;
  94        struct commit *old, *new;
  95        struct commit_list *list, *used;
  96        int found = 0;
  97
  98        /* Both new and old must be commit-ish and new is descendant of
  99         * old.  Otherwise we require --force.
 100         */
 101        o = deref_tag(parse_object(old_sha1), NULL, 0);
 102        if (!o || o->type != OBJ_COMMIT)
 103                return 0;
 104        old = (struct commit *) o;
 105
 106        o = deref_tag(parse_object(new_sha1), NULL, 0);
 107        if (!o || o->type != OBJ_COMMIT)
 108                return 0;
 109        new = (struct commit *) o;
 110
 111        if (parse_commit(new) < 0)
 112                return 0;
 113
 114        used = list = NULL;
 115        commit_list_insert(new, &list);
 116        while (list) {
 117                new = pop_most_recent_commit(&list, 1);
 118                commit_list_insert(new, &used);
 119                if (new == old) {
 120                        found = 1;
 121                        break;
 122                }
 123        }
 124        unmark_and_free(list, 1);
 125        unmark_and_free(used, 1);
 126        return found;
 127}
 128
 129static struct ref *local_refs, **local_tail;
 130static struct ref *remote_refs, **remote_tail;
 131
 132static int one_local_ref(const char *refname, const unsigned char *sha1, int flag, void *cb_data)
 133{
 134        struct ref *ref;
 135        int len = strlen(refname) + 1;
 136        ref = xcalloc(1, sizeof(*ref) + len);
 137        hashcpy(ref->new_sha1, sha1);
 138        memcpy(ref->name, refname, len);
 139        *local_tail = ref;
 140        local_tail = &ref->next;
 141        return 0;
 142}
 143
 144static void get_local_heads(void)
 145{
 146        local_tail = &local_refs;
 147        for_each_ref(one_local_ref, NULL);
 148}
 149
 150static int receive_status(int in)
 151{
 152        char line[1000];
 153        int ret = 0;
 154        int len = packet_read_line(in, line, sizeof(line));
 155        if (len < 10 || memcmp(line, "unpack ", 7)) {
 156                fprintf(stderr, "did not receive status back\n");
 157                return -1;
 158        }
 159        if (memcmp(line, "unpack ok\n", 10)) {
 160                fputs(line, stderr);
 161                ret = -1;
 162        }
 163        while (1) {
 164                len = packet_read_line(in, line, sizeof(line));
 165                if (!len)
 166                        break;
 167                if (len < 3 ||
 168                    (memcmp(line, "ok", 2) && memcmp(line, "ng", 2))) {
 169                        fprintf(stderr, "protocol error: %s\n", line);
 170                        ret = -1;
 171                        break;
 172                }
 173                if (!memcmp(line, "ok", 2))
 174                        continue;
 175                fputs(line, stderr);
 176                ret = -1;
 177        }
 178        return ret;
 179}
 180
 181static void update_tracking_ref(struct remote *remote, struct ref *ref)
 182{
 183        struct refspec rs;
 184        int will_delete_ref;
 185
 186        rs.src = ref->name;
 187        rs.dst = NULL;
 188
 189        if (!ref->peer_ref)
 190                return;
 191
 192        will_delete_ref = is_null_sha1(ref->peer_ref->new_sha1);
 193
 194        if (!will_delete_ref &&
 195                        !hashcmp(ref->old_sha1, ref->peer_ref->new_sha1))
 196                return;
 197
 198        if (!remote_find_tracking(remote, &rs)) {
 199                fprintf(stderr, "updating local tracking ref '%s'\n", rs.dst);
 200                if (is_null_sha1(ref->peer_ref->new_sha1)) {
 201                        if (delete_ref(rs.dst, NULL))
 202                                error("Failed to delete");
 203                } else
 204                        update_ref("update by push", rs.dst,
 205                                        ref->new_sha1, NULL, 0, 0);
 206                free(rs.dst);
 207        }
 208}
 209
 210static int send_pack(int in, int out, struct remote *remote, int nr_refspec, char **refspec)
 211{
 212        struct ref *ref;
 213        int new_refs;
 214        int ret = 0;
 215        int ask_for_status_report = 0;
 216        int allow_deleting_refs = 0;
 217        int expect_status_report = 0;
 218
 219        /* No funny business with the matcher */
 220        remote_tail = get_remote_heads(in, &remote_refs, 0, NULL, REF_NORMAL);
 221        get_local_heads();
 222
 223        /* Does the other end support the reporting? */
 224        if (server_supports("report-status"))
 225                ask_for_status_report = 1;
 226        if (server_supports("delete-refs"))
 227                allow_deleting_refs = 1;
 228
 229        /* match them up */
 230        if (!remote_tail)
 231                remote_tail = &remote_refs;
 232        if (match_refs(local_refs, remote_refs, &remote_tail,
 233                       nr_refspec, refspec, send_all))
 234                return -1;
 235
 236        if (!remote_refs) {
 237                fprintf(stderr, "No refs in common and none specified; doing nothing.\n"
 238                        "Perhaps you should specify a branch such as 'master'.\n");
 239                return 0;
 240        }
 241
 242        /*
 243         * Finally, tell the other end!
 244         */
 245        new_refs = 0;
 246        for (ref = remote_refs; ref; ref = ref->next) {
 247                char old_hex[60], *new_hex;
 248                int will_delete_ref;
 249
 250                if (!ref->peer_ref)
 251                        continue;
 252
 253
 254                will_delete_ref = is_null_sha1(ref->peer_ref->new_sha1);
 255                if (will_delete_ref && !allow_deleting_refs) {
 256                        error("remote does not support deleting refs");
 257                        ret = -2;
 258                        continue;
 259                }
 260                if (!will_delete_ref &&
 261                    !hashcmp(ref->old_sha1, ref->peer_ref->new_sha1)) {
 262                        if (verbose)
 263                                fprintf(stderr, "'%s': up-to-date\n", ref->name);
 264                        continue;
 265                }
 266
 267                /* This part determines what can overwrite what.
 268                 * The rules are:
 269                 *
 270                 * (0) you can always use --force or +A:B notation to
 271                 *     selectively force individual ref pairs.
 272                 *
 273                 * (1) if the old thing does not exist, it is OK.
 274                 *
 275                 * (2) if you do not have the old thing, you are not allowed
 276                 *     to overwrite it; you would not know what you are losing
 277                 *     otherwise.
 278                 *
 279                 * (3) if both new and old are commit-ish, and new is a
 280                 *     descendant of old, it is OK.
 281                 *
 282                 * (4) regardless of all of the above, removing :B is
 283                 *     always allowed.
 284                 */
 285
 286                if (!force_update &&
 287                    !will_delete_ref &&
 288                    !is_null_sha1(ref->old_sha1) &&
 289                    !ref->force) {
 290                        if (!has_sha1_file(ref->old_sha1) ||
 291                            !ref_newer(ref->peer_ref->new_sha1,
 292                                       ref->old_sha1)) {
 293                                /* We do not have the remote ref, or
 294                                 * we know that the remote ref is not
 295                                 * an ancestor of what we are trying to
 296                                 * push.  Either way this can be losing
 297                                 * commits at the remote end and likely
 298                                 * we were not up to date to begin with.
 299                                 */
 300                                error("remote '%s' is not an ancestor of\n"
 301                                      " local  '%s'.\n"
 302                                      " Maybe you are not up-to-date and "
 303                                      "need to pull first?",
 304                                      ref->name,
 305                                      ref->peer_ref->name);
 306                                ret = -2;
 307                                continue;
 308                        }
 309                }
 310                hashcpy(ref->new_sha1, ref->peer_ref->new_sha1);
 311                if (!will_delete_ref)
 312                        new_refs++;
 313                strcpy(old_hex, sha1_to_hex(ref->old_sha1));
 314                new_hex = sha1_to_hex(ref->new_sha1);
 315
 316                if (!dry_run) {
 317                        if (ask_for_status_report) {
 318                                packet_write(out, "%s %s %s%c%s",
 319                                        old_hex, new_hex, ref->name, 0,
 320                                        "report-status");
 321                                ask_for_status_report = 0;
 322                                expect_status_report = 1;
 323                        }
 324                        else
 325                                packet_write(out, "%s %s %s",
 326                                        old_hex, new_hex, ref->name);
 327                }
 328                if (will_delete_ref)
 329                        fprintf(stderr, "deleting '%s'\n", ref->name);
 330                else {
 331                        fprintf(stderr, "updating '%s'", ref->name);
 332                        if (strcmp(ref->name, ref->peer_ref->name))
 333                                fprintf(stderr, " using '%s'",
 334                                        ref->peer_ref->name);
 335                        fprintf(stderr, "\n  from %s\n  to   %s\n",
 336                                old_hex, new_hex);
 337                }
 338        }
 339
 340        packet_flush(out);
 341        if (new_refs && !dry_run)
 342                ret = pack_objects(out, remote_refs);
 343        close(out);
 344
 345        if (expect_status_report) {
 346                if (receive_status(in))
 347                        ret = -4;
 348        }
 349
 350        if (!dry_run && remote && ret == 0) {
 351                for (ref = remote_refs; ref; ref = ref->next)
 352                        update_tracking_ref(remote, ref);
 353        }
 354
 355        if (!new_refs && ret == 0)
 356                fprintf(stderr, "Everything up-to-date\n");
 357        return ret;
 358}
 359
 360static void verify_remote_names(int nr_heads, char **heads)
 361{
 362        int i;
 363
 364        for (i = 0; i < nr_heads; i++) {
 365                const char *remote = strchr(heads[i], ':');
 366
 367                remote = remote ? (remote + 1) : heads[i];
 368                switch (check_ref_format(remote)) {
 369                case 0: /* ok */
 370                case -2: /* ok but a single level -- that is fine for
 371                          * a match pattern.
 372                          */
 373                case -3: /* ok but ends with a pattern-match character */
 374                        continue;
 375                }
 376                die("remote part of refspec is not a valid name in %s",
 377                    heads[i]);
 378        }
 379}
 380
 381int main(int argc, char **argv)
 382{
 383        int i, nr_heads = 0;
 384        char *dest = NULL;
 385        char **heads = NULL;
 386        int fd[2], ret;
 387        struct child_process *conn;
 388        char *remote_name = NULL;
 389        struct remote *remote = NULL;
 390
 391        setup_git_directory();
 392        git_config(git_default_config);
 393
 394        argv++;
 395        for (i = 1; i < argc; i++, argv++) {
 396                char *arg = *argv;
 397
 398                if (*arg == '-') {
 399                        if (!prefixcmp(arg, "--receive-pack=")) {
 400                                receivepack = arg + 15;
 401                                continue;
 402                        }
 403                        if (!prefixcmp(arg, "--exec=")) {
 404                                receivepack = arg + 7;
 405                                continue;
 406                        }
 407                        if (!prefixcmp(arg, "--remote=")) {
 408                                remote_name = arg + 9;
 409                                continue;
 410                        }
 411                        if (!strcmp(arg, "--all")) {
 412                                send_all = 1;
 413                                continue;
 414                        }
 415                        if (!strcmp(arg, "--dry-run")) {
 416                                dry_run = 1;
 417                                continue;
 418                        }
 419                        if (!strcmp(arg, "--force")) {
 420                                force_update = 1;
 421                                continue;
 422                        }
 423                        if (!strcmp(arg, "--verbose")) {
 424                                verbose = 1;
 425                                continue;
 426                        }
 427                        if (!strcmp(arg, "--thin")) {
 428                                use_thin_pack = 1;
 429                                continue;
 430                        }
 431                        usage(send_pack_usage);
 432                }
 433                if (!dest) {
 434                        dest = arg;
 435                        continue;
 436                }
 437                heads = argv;
 438                nr_heads = argc - i;
 439                break;
 440        }
 441        if (!dest)
 442                usage(send_pack_usage);
 443        if (heads && send_all)
 444                usage(send_pack_usage);
 445        verify_remote_names(nr_heads, heads);
 446
 447        if (remote_name) {
 448                remote = remote_get(remote_name);
 449                if (!remote_has_url(remote, dest)) {
 450                        die("Destination %s is not a uri for %s",
 451                            dest, remote_name);
 452                }
 453        }
 454
 455        conn = git_connect(fd, dest, receivepack, verbose ? CONNECT_VERBOSE : 0);
 456        ret = send_pack(fd[0], fd[1], remote, nr_heads, heads);
 457        close(fd[0]);
 458        close(fd[1]);
 459        ret |= finish_connect(conn);
 460        return !!ret;
 461}