send-pack.con commit pkt-line: move a misplaced comment (e148542)
   1#include "builtin.h"
   2#include "commit.h"
   3#include "refs.h"
   4#include "pkt-line.h"
   5#include "sideband.h"
   6#include "run-command.h"
   7#include "remote.h"
   8#include "send-pack.h"
   9#include "quote.h"
  10#include "transport.h"
  11#include "version.h"
  12
  13static int feed_object(const unsigned char *sha1, int fd, int negative)
  14{
  15        char buf[42];
  16
  17        if (negative && !has_sha1_file(sha1))
  18                return 1;
  19
  20        memcpy(buf + negative, sha1_to_hex(sha1), 40);
  21        if (negative)
  22                buf[0] = '^';
  23        buf[40 + negative] = '\n';
  24        return write_or_whine(fd, buf, 41 + negative, "send-pack: send refs");
  25}
  26
  27/*
  28 * Make a pack stream and spit it out into file descriptor fd
  29 */
  30static int pack_objects(int fd, struct ref *refs, struct extra_have_objects *extra, struct send_pack_args *args)
  31{
  32        /*
  33         * The child becomes pack-objects --revs; we feed
  34         * the revision parameters to it via its stdin and
  35         * let its stdout go back to the other end.
  36         */
  37        const char *argv[] = {
  38                "pack-objects",
  39                "--all-progress-implied",
  40                "--revs",
  41                "--stdout",
  42                NULL,
  43                NULL,
  44                NULL,
  45                NULL,
  46                NULL,
  47        };
  48        struct child_process po;
  49        int i;
  50
  51        i = 4;
  52        if (args->use_thin_pack)
  53                argv[i++] = "--thin";
  54        if (args->use_ofs_delta)
  55                argv[i++] = "--delta-base-offset";
  56        if (args->quiet || !args->progress)
  57                argv[i++] = "-q";
  58        if (args->progress)
  59                argv[i++] = "--progress";
  60        memset(&po, 0, sizeof(po));
  61        po.argv = argv;
  62        po.in = -1;
  63        po.out = args->stateless_rpc ? -1 : fd;
  64        po.git_cmd = 1;
  65        if (start_command(&po))
  66                die_errno("git pack-objects failed");
  67
  68        /*
  69         * We feed the pack-objects we just spawned with revision
  70         * parameters by writing to the pipe.
  71         */
  72        for (i = 0; i < extra->nr; i++)
  73                if (!feed_object(extra->array[i], po.in, 1))
  74                        break;
  75
  76        while (refs) {
  77                if (!is_null_sha1(refs->old_sha1) &&
  78                    !feed_object(refs->old_sha1, po.in, 1))
  79                        break;
  80                if (!is_null_sha1(refs->new_sha1) &&
  81                    !feed_object(refs->new_sha1, po.in, 0))
  82                        break;
  83                refs = refs->next;
  84        }
  85
  86        close(po.in);
  87
  88        if (args->stateless_rpc) {
  89                char *buf = xmalloc(LARGE_PACKET_MAX);
  90                while (1) {
  91                        ssize_t n = xread(po.out, buf, LARGE_PACKET_MAX);
  92                        if (n <= 0)
  93                                break;
  94                        send_sideband(fd, -1, buf, n, LARGE_PACKET_MAX);
  95                }
  96                free(buf);
  97                close(po.out);
  98                po.out = -1;
  99        }
 100
 101        if (finish_command(&po))
 102                return -1;
 103        return 0;
 104}
 105
 106static int receive_status(int in, struct ref *refs)
 107{
 108        struct ref *hint;
 109        char line[1000];
 110        int ret = 0;
 111        int len = packet_read_line(in, line, sizeof(line));
 112        if (prefixcmp(line, "unpack "))
 113                return error("did not receive remote status");
 114        if (strcmp(line, "unpack ok\n")) {
 115                char *p = line + strlen(line) - 1;
 116                if (*p == '\n')
 117                        *p = '\0';
 118                error("unpack failed: %s", line + 7);
 119                ret = -1;
 120        }
 121        hint = NULL;
 122        while (1) {
 123                char *refname;
 124                char *msg;
 125                len = packet_read_line(in, line, sizeof(line));
 126                if (!len)
 127                        break;
 128                if (prefixcmp(line, "ok ") && prefixcmp(line, "ng ")) {
 129                        error("invalid ref status from remote: %s", line);
 130                        ret = -1;
 131                        break;
 132                }
 133
 134                line[strlen(line)-1] = '\0';
 135                refname = line + 3;
 136                msg = strchr(refname, ' ');
 137                if (msg)
 138                        *msg++ = '\0';
 139
 140                /* first try searching at our hint, falling back to all refs */
 141                if (hint)
 142                        hint = find_ref_by_name(hint, refname);
 143                if (!hint)
 144                        hint = find_ref_by_name(refs, refname);
 145                if (!hint) {
 146                        warning("remote reported status on unknown ref: %s",
 147                                        refname);
 148                        continue;
 149                }
 150                if (hint->status != REF_STATUS_EXPECTING_REPORT) {
 151                        warning("remote reported status on unexpected ref: %s",
 152                                        refname);
 153                        continue;
 154                }
 155
 156                if (line[0] == 'o' && line[1] == 'k')
 157                        hint->status = REF_STATUS_OK;
 158                else {
 159                        hint->status = REF_STATUS_REMOTE_REJECT;
 160                        ret = -1;
 161                }
 162                if (msg)
 163                        hint->remote_status = xstrdup(msg);
 164                /* start our next search from the next ref */
 165                hint = hint->next;
 166        }
 167        return ret;
 168}
 169
 170static int sideband_demux(int in, int out, void *data)
 171{
 172        int *fd = data, ret;
 173#ifdef NO_PTHREADS
 174        close(fd[1]);
 175#endif
 176        ret = recv_sideband("send-pack", fd[0], out);
 177        close(out);
 178        return ret;
 179}
 180
 181int send_pack(struct send_pack_args *args,
 182              int fd[], struct child_process *conn,
 183              struct ref *remote_refs,
 184              struct extra_have_objects *extra_have)
 185{
 186        int in = fd[0];
 187        int out = fd[1];
 188        struct strbuf req_buf = STRBUF_INIT;
 189        struct ref *ref;
 190        int new_refs;
 191        int allow_deleting_refs = 0;
 192        int status_report = 0;
 193        int use_sideband = 0;
 194        int quiet_supported = 0;
 195        int agent_supported = 0;
 196        unsigned cmds_sent = 0;
 197        int ret;
 198        struct async demux;
 199
 200        /* Does the other end support the reporting? */
 201        if (server_supports("report-status"))
 202                status_report = 1;
 203        if (server_supports("delete-refs"))
 204                allow_deleting_refs = 1;
 205        if (server_supports("ofs-delta"))
 206                args->use_ofs_delta = 1;
 207        if (server_supports("side-band-64k"))
 208                use_sideband = 1;
 209        if (server_supports("quiet"))
 210                quiet_supported = 1;
 211        if (server_supports("agent"))
 212                agent_supported = 1;
 213
 214        if (!remote_refs) {
 215                fprintf(stderr, "No refs in common and none specified; doing nothing.\n"
 216                        "Perhaps you should specify a branch such as 'master'.\n");
 217                return 0;
 218        }
 219
 220        /*
 221         * Finally, tell the other end!
 222         */
 223        new_refs = 0;
 224        for (ref = remote_refs; ref; ref = ref->next) {
 225                if (!ref->peer_ref && !args->send_mirror)
 226                        continue;
 227
 228                /* Check for statuses set by set_ref_status_for_push() */
 229                switch (ref->status) {
 230                case REF_STATUS_REJECT_NONFASTFORWARD:
 231                case REF_STATUS_REJECT_ALREADY_EXISTS:
 232                case REF_STATUS_REJECT_FETCH_FIRST:
 233                case REF_STATUS_REJECT_NEEDS_FORCE:
 234                case REF_STATUS_UPTODATE:
 235                        continue;
 236                default:
 237                        ; /* do nothing */
 238                }
 239
 240                if (ref->deletion && !allow_deleting_refs) {
 241                        ref->status = REF_STATUS_REJECT_NODELETE;
 242                        continue;
 243                }
 244
 245                if (!ref->deletion)
 246                        new_refs++;
 247
 248                if (args->dry_run) {
 249                        ref->status = REF_STATUS_OK;
 250                } else {
 251                        char *old_hex = sha1_to_hex(ref->old_sha1);
 252                        char *new_hex = sha1_to_hex(ref->new_sha1);
 253                        int quiet = quiet_supported && (args->quiet || !args->progress);
 254
 255                        if (!cmds_sent && (status_report || use_sideband ||
 256                                           quiet || agent_supported)) {
 257                                packet_buf_write(&req_buf,
 258                                                 "%s %s %s%c%s%s%s%s%s",
 259                                                 old_hex, new_hex, ref->name, 0,
 260                                                 status_report ? " report-status" : "",
 261                                                 use_sideband ? " side-band-64k" : "",
 262                                                 quiet ? " quiet" : "",
 263                                                 agent_supported ? " agent=" : "",
 264                                                 agent_supported ? git_user_agent_sanitized() : ""
 265                                                );
 266                        }
 267                        else
 268                                packet_buf_write(&req_buf, "%s %s %s",
 269                                                 old_hex, new_hex, ref->name);
 270                        ref->status = status_report ?
 271                                REF_STATUS_EXPECTING_REPORT :
 272                                REF_STATUS_OK;
 273                        cmds_sent++;
 274                }
 275        }
 276
 277        if (args->stateless_rpc) {
 278                if (!args->dry_run && cmds_sent) {
 279                        packet_buf_flush(&req_buf);
 280                        send_sideband(out, -1, req_buf.buf, req_buf.len, LARGE_PACKET_MAX);
 281                }
 282        } else {
 283                safe_write(out, req_buf.buf, req_buf.len);
 284                packet_flush(out);
 285        }
 286        strbuf_release(&req_buf);
 287
 288        if (use_sideband && cmds_sent) {
 289                memset(&demux, 0, sizeof(demux));
 290                demux.proc = sideband_demux;
 291                demux.data = fd;
 292                demux.out = -1;
 293                if (start_async(&demux))
 294                        die("send-pack: unable to fork off sideband demultiplexer");
 295                in = demux.out;
 296        }
 297
 298        if (new_refs && cmds_sent) {
 299                if (pack_objects(out, remote_refs, extra_have, args) < 0) {
 300                        for (ref = remote_refs; ref; ref = ref->next)
 301                                ref->status = REF_STATUS_NONE;
 302                        if (args->stateless_rpc)
 303                                close(out);
 304                        if (git_connection_is_socket(conn))
 305                                shutdown(fd[0], SHUT_WR);
 306                        if (use_sideband)
 307                                finish_async(&demux);
 308                        return -1;
 309                }
 310        }
 311        if (args->stateless_rpc && cmds_sent)
 312                packet_flush(out);
 313
 314        if (status_report && cmds_sent)
 315                ret = receive_status(in, remote_refs);
 316        else
 317                ret = 0;
 318        if (args->stateless_rpc)
 319                packet_flush(out);
 320
 321        if (use_sideband && cmds_sent) {
 322                if (finish_async(&demux)) {
 323                        error("error in sideband demultiplexer");
 324                        ret = -1;
 325                }
 326                close(demux.out);
 327        }
 328
 329        if (ret < 0)
 330                return ret;
 331
 332        if (args->porcelain)
 333                return 0;
 334
 335        for (ref = remote_refs; ref; ref = ref->next) {
 336                switch (ref->status) {
 337                case REF_STATUS_NONE:
 338                case REF_STATUS_UPTODATE:
 339                case REF_STATUS_OK:
 340                        break;
 341                default:
 342                        return -1;
 343                }
 344        }
 345        return 0;
 346}