remote-testsvn.con commit print errno when reporting a system call error (5118d7f)
   1#include "cache.h"
   2#include "refs.h"
   3#include "remote.h"
   4#include "strbuf.h"
   5#include "url.h"
   6#include "exec_cmd.h"
   7#include "run-command.h"
   8#include "vcs-svn/svndump.h"
   9#include "notes.h"
  10#include "argv-array.h"
  11
  12static const char *url;
  13static int dump_from_file;
  14static const char *private_ref;
  15static const char *remote_ref = "refs/heads/master";
  16static const char *marksfilename, *notes_ref;
  17struct rev_note { unsigned int rev_nr; };
  18
  19static int cmd_capabilities(const char *line);
  20static int cmd_import(const char *line);
  21static int cmd_list(const char *line);
  22
  23typedef int (*input_command_handler)(const char *);
  24struct input_command_entry {
  25        const char *name;
  26        input_command_handler fn;
  27        unsigned char batchable;        /* whether the command starts or is part of a batch */
  28};
  29
  30static const struct input_command_entry input_command_list[] = {
  31        { "capabilities", cmd_capabilities, 0 },
  32        { "import", cmd_import, 1 },
  33        { "list", cmd_list, 0 },
  34        { NULL, NULL }
  35};
  36
  37static int cmd_capabilities(const char *line)
  38{
  39        printf("import\n");
  40        printf("bidi-import\n");
  41        printf("refspec %s:%s\n\n", remote_ref, private_ref);
  42        fflush(stdout);
  43        return 0;
  44}
  45
  46static void terminate_batch(void)
  47{
  48        /* terminate a current batch's fast-import stream */
  49        printf("done\n");
  50        fflush(stdout);
  51}
  52
  53/* NOTE: 'ref' refers to a git reference, while 'rev' refers to a svn revision. */
  54static char *read_ref_note(const unsigned char sha1[20])
  55{
  56        const unsigned char *note_sha1;
  57        char *msg = NULL;
  58        unsigned long msglen;
  59        enum object_type type;
  60
  61        init_notes(NULL, notes_ref, NULL, 0);
  62        if (!(note_sha1 = get_note(NULL, sha1)))
  63                return NULL;    /* note tree not found */
  64        if (!(msg = read_sha1_file(note_sha1, &type, &msglen)))
  65                error("Empty notes tree. %s", notes_ref);
  66        else if (!msglen || type != OBJ_BLOB) {
  67                error("Note contains unusable content. "
  68                        "Is something else using this notes tree? %s", notes_ref);
  69                free(msg);
  70                msg = NULL;
  71        }
  72        free_notes(NULL);
  73        return msg;
  74}
  75
  76static int parse_rev_note(const char *msg, struct rev_note *res)
  77{
  78        const char *key, *value, *end;
  79        size_t len;
  80
  81        while (*msg) {
  82                end = strchrnul(msg, '\n');
  83                len = end - msg;
  84
  85                key = "Revision-number: ";
  86                if (starts_with(msg, key)) {
  87                        long i;
  88                        char *end;
  89                        value = msg + strlen(key);
  90                        i = strtol(value, &end, 0);
  91                        if (end == value || i < 0 || i > UINT32_MAX)
  92                                return -1;
  93                        res->rev_nr = i;
  94                        return 0;
  95                }
  96                msg += len + 1;
  97        }
  98        /* didn't find it */
  99        return -1;
 100}
 101
 102static int note2mark_cb(const unsigned char *object_sha1,
 103                const unsigned char *note_sha1, char *note_path,
 104                void *cb_data)
 105{
 106        FILE *file = (FILE *)cb_data;
 107        char *msg;
 108        unsigned long msglen;
 109        enum object_type type;
 110        struct rev_note note;
 111
 112        if (!(msg = read_sha1_file(note_sha1, &type, &msglen)) ||
 113                        !msglen || type != OBJ_BLOB) {
 114                free(msg);
 115                return 1;
 116        }
 117        if (parse_rev_note(msg, &note))
 118                return 2;
 119        if (fprintf(file, ":%d %s\n", note.rev_nr, sha1_to_hex(object_sha1)) < 1)
 120                return 3;
 121        return 0;
 122}
 123
 124static void regenerate_marks(void)
 125{
 126        int ret;
 127        FILE *marksfile = xfopen(marksfilename, "w+");
 128
 129        ret = for_each_note(NULL, 0, note2mark_cb, marksfile);
 130        if (ret)
 131                die("Regeneration of marks failed, returned %d.", ret);
 132        fclose(marksfile);
 133}
 134
 135static void check_or_regenerate_marks(int latestrev)
 136{
 137        FILE *marksfile;
 138        struct strbuf sb = STRBUF_INIT;
 139        struct strbuf line = STRBUF_INIT;
 140        int found = 0;
 141
 142        if (latestrev < 1)
 143                return;
 144
 145        init_notes(NULL, notes_ref, NULL, 0);
 146        marksfile = fopen(marksfilename, "r");
 147        if (!marksfile) {
 148                regenerate_marks();
 149                marksfile = xfopen(marksfilename, "r");
 150                fclose(marksfile);
 151        } else {
 152                strbuf_addf(&sb, ":%d ", latestrev);
 153                while (strbuf_getline_lf(&line, marksfile) != EOF) {
 154                        if (starts_with(line.buf, sb.buf)) {
 155                                found++;
 156                                break;
 157                        }
 158                }
 159                fclose(marksfile);
 160                if (!found)
 161                        regenerate_marks();
 162        }
 163        free_notes(NULL);
 164        strbuf_release(&sb);
 165        strbuf_release(&line);
 166}
 167
 168static int cmd_import(const char *line)
 169{
 170        int code;
 171        int dumpin_fd;
 172        char *note_msg;
 173        unsigned char head_sha1[20];
 174        unsigned int startrev;
 175        struct child_process svndump_proc = CHILD_PROCESS_INIT;
 176        const char *command = "svnrdump";
 177
 178        if (read_ref(private_ref, head_sha1))
 179                startrev = 0;
 180        else {
 181                note_msg = read_ref_note(head_sha1);
 182                if(note_msg == NULL) {
 183                        warning("No note found for %s.", private_ref);
 184                        startrev = 0;
 185                } else {
 186                        struct rev_note note = { 0 };
 187                        if (parse_rev_note(note_msg, &note))
 188                                die("Revision number couldn't be parsed from note.");
 189                        startrev = note.rev_nr + 1;
 190                        free(note_msg);
 191                }
 192        }
 193        check_or_regenerate_marks(startrev - 1);
 194
 195        if (dump_from_file) {
 196                dumpin_fd = open(url, O_RDONLY);
 197                if(dumpin_fd < 0)
 198                        die_errno("Couldn't open svn dump file %s.", url);
 199        } else {
 200                svndump_proc.out = -1;
 201                argv_array_push(&svndump_proc.args, command);
 202                argv_array_push(&svndump_proc.args, "dump");
 203                argv_array_push(&svndump_proc.args, url);
 204                argv_array_pushf(&svndump_proc.args, "-r%u:HEAD", startrev);
 205
 206                code = start_command(&svndump_proc);
 207                if (code)
 208                        die("Unable to start %s, code %d", command, code);
 209                dumpin_fd = svndump_proc.out;
 210        }
 211        /* setup marks file import/export */
 212        printf("feature import-marks-if-exists=%s\n"
 213                        "feature export-marks=%s\n", marksfilename, marksfilename);
 214
 215        svndump_init_fd(dumpin_fd, STDIN_FILENO);
 216        svndump_read(url, private_ref, notes_ref);
 217        svndump_deinit();
 218        svndump_reset();
 219
 220        close(dumpin_fd);
 221        if (!dump_from_file) {
 222                code = finish_command(&svndump_proc);
 223                if (code)
 224                        warning("%s, returned %d", command, code);
 225        }
 226
 227        return 0;
 228}
 229
 230static int cmd_list(const char *line)
 231{
 232        printf("? %s\n\n", remote_ref);
 233        fflush(stdout);
 234        return 0;
 235}
 236
 237static int do_command(struct strbuf *line)
 238{
 239        const struct input_command_entry *p = input_command_list;
 240        static struct string_list batchlines = STRING_LIST_INIT_DUP;
 241        static const struct input_command_entry *batch_cmd;
 242        /*
 243         * commands can be grouped together in a batch.
 244         * Batches are ended by \n. If no batch is active the program ends.
 245         * During a batch all lines are buffered and passed to the handler function
 246         * when the batch is terminated.
 247         */
 248        if (line->len == 0) {
 249                if (batch_cmd) {
 250                        struct string_list_item *item;
 251                        for_each_string_list_item(item, &batchlines)
 252                                batch_cmd->fn(item->string);
 253                        terminate_batch();
 254                        batch_cmd = NULL;
 255                        string_list_clear(&batchlines, 0);
 256                        return 0;       /* end of the batch, continue reading other commands. */
 257                }
 258                return 1;       /* end of command stream, quit */
 259        }
 260        if (batch_cmd) {
 261                if (!starts_with(batch_cmd->name, line->buf))
 262                        die("Active %s batch interrupted by %s", batch_cmd->name, line->buf);
 263                /* buffer batch lines */
 264                string_list_append(&batchlines, line->buf);
 265                return 0;
 266        }
 267
 268        for (p = input_command_list; p->name; p++) {
 269                if (starts_with(line->buf, p->name) && (strlen(p->name) == line->len ||
 270                                line->buf[strlen(p->name)] == ' ')) {
 271                        if (p->batchable) {
 272                                batch_cmd = p;
 273                                string_list_append(&batchlines, line->buf);
 274                                return 0;
 275                        }
 276                        return p->fn(line->buf);
 277                }
 278        }
 279        die("Unknown command '%s'\n", line->buf);
 280        return 0;
 281}
 282
 283int cmd_main(int argc, const char **argv)
 284{
 285        struct strbuf buf = STRBUF_INIT, url_sb = STRBUF_INIT,
 286                        private_ref_sb = STRBUF_INIT, marksfilename_sb = STRBUF_INIT,
 287                        notes_ref_sb = STRBUF_INIT;
 288        static struct remote *remote;
 289        const char *url_in;
 290
 291        setup_git_directory();
 292        if (argc < 2 || argc > 3) {
 293                usage("git-remote-svn <remote-name> [<url>]");
 294                return 1;
 295        }
 296
 297        remote = remote_get(argv[1]);
 298        url_in = (argc == 3) ? argv[2] : remote->url[0];
 299
 300        if (starts_with(url_in, "file://")) {
 301                dump_from_file = 1;
 302                url = url_decode(url_in + sizeof("file://")-1);
 303        } else {
 304                dump_from_file = 0;
 305                end_url_with_slash(&url_sb, url_in);
 306                url = url_sb.buf;
 307        }
 308
 309        strbuf_addf(&private_ref_sb, "refs/svn/%s/master", remote->name);
 310        private_ref = private_ref_sb.buf;
 311
 312        strbuf_addf(&notes_ref_sb, "refs/notes/%s/revs", remote->name);
 313        notes_ref = notes_ref_sb.buf;
 314
 315        strbuf_addf(&marksfilename_sb, "%s/info/fast-import/remote-svn/%s.marks",
 316                get_git_dir(), remote->name);
 317        marksfilename = marksfilename_sb.buf;
 318
 319        while (1) {
 320                if (strbuf_getline_lf(&buf, stdin) == EOF) {
 321                        if (ferror(stdin))
 322                                die("Error reading command stream");
 323                        else
 324                                die("Unexpected end of command stream");
 325                }
 326                if (do_command(&buf))
 327                        break;
 328                strbuf_reset(&buf);
 329        }
 330
 331        strbuf_release(&buf);
 332        strbuf_release(&url_sb);
 333        strbuf_release(&private_ref_sb);
 334        strbuf_release(&notes_ref_sb);
 335        strbuf_release(&marksfilename_sb);
 336        return 0;
 337}