Merge branch 'bs/maint-t7005' into maint

[git.git] / builtin-bundle.c

diff --git a/builtin-bundle.c b/builtin-bundle.c
index b954213f702a5ec8ee0cadf6cb79295272b73ca5..d1840555d6ffe589d60add61b172dd329545f376 100644 (file)
--- a/builtin-bundle.c
+++ b/builtin-bundle.c
@@ -6,6 +6,7 @@
 #include "revision.h"
 #include "list-objects.h"
 #include "run-command.h"
+#include "refs.h"
 
 /*
  * Basic handler for bundle files to connect repositories via sneakernet.
@@ -44,38 +45,21 @@ struct bundle_header {
        struct ref_list references;
 };
 
-/* this function returns the length of the string */
-static int read_string(int fd, char *buffer, int size)
-{
-       int i;
-       for (i = 0; i < size - 1; i++) {
-               ssize_t count = xread(fd, buffer + i, 1);
-               if (count < 0)
-                       return error("Read error: %s", strerror(errno));
-               if (count == 0) {
-                       i--;
-                       break;
-               }
-               if (buffer[i] == '\n')
-                       break;
-       }
-       buffer[i + 1] = '\0';
-       return i + 1;
-}
-
 /* returns an fd */
 static int read_header(const char *path, struct bundle_header *header) {
        char buffer[1024];
-       int fd = open(path, O_RDONLY);
+       int fd;
+       long fpos;
+       FILE *ffd = fopen(path, "rb");
 
-       if (fd < 0)
+       if (!ffd)
                return error("could not open '%s'", path);
-       if (read_string(fd, buffer, sizeof(buffer)) < 0 ||
+       if (!fgets(buffer, sizeof(buffer), ffd) ||
                        strcmp(buffer, bundle_signature)) {
-               close(fd);
+               fclose(ffd);
                return error("'%s' does not look like a v2 bundle file", path);
        }
-       while (read_string(fd, buffer, sizeof(buffer)) > 0
+       while (fgets(buffer, sizeof(buffer), ffd)
                        && buffer[0] != '\n') {
                int is_prereq = buffer[0] == '-';
                int offset = is_prereq ? 1 : 0;
@@ -97,6 +81,12 @@ static int read_header(const char *path, struct bundle_header *header) {
                add_to_ref_list(sha1, isspace(delim) ?
                                buffer + 41 + offset : "", list);
        }
+       fpos = ftell(ffd);
+       fclose(ffd);
+       fd = open(path, O_RDONLY);
+       if (fd < 0)
+               return error("could not open '%s'", path);
+       lseek(fd, fpos, SEEK_SET);
        return fd;
 }
 
@@ -200,7 +190,9 @@ static int list_heads(struct bundle_header *header, int argc, const char **argv)
 static int create_bundle(struct bundle_header *header, const char *path,
                int argc, const char **argv)
 {
+       static struct lock_file lock;
        int bundle_fd = -1;
+       int bundle_to_stdout;
        const char **argv_boundary = xmalloc((argc + 4) * sizeof(const char *));
        const char **argv_pack = xmalloc(5 * sizeof(const char *));
        int i, ref_count = 0;
@@ -209,14 +201,11 @@ static int create_bundle(struct bundle_header *header, const char *path,
        struct child_process rls;
        FILE *rls_fout;
 
-       /*
-        * NEEDSWORK: this should use something like lock-file
-        * to create temporary that is cleaned up upon error.
-        */
-       bundle_fd = (!strcmp(path, "-") ? 1 :
-                       open(path, O_CREAT | O_EXCL | O_WRONLY, 0666));
-       if (bundle_fd < 0)
-               return error("Could not create '%s': %s", path, strerror(errno));
+       bundle_to_stdout = !strcmp(path, "-");
+       if (bundle_to_stdout)
+               bundle_fd = 1;
+       else
+               bundle_fd = hold_lock_file_for_update(&lock, path, 1);
 
        /* write signature */
        write_or_die(bundle_fd, bundle_signature, strlen(bundle_signature));
@@ -265,11 +254,17 @@ static int create_bundle(struct bundle_header *header, const char *path,
                struct object_array_entry *e = revs.pending.objects + i;
                unsigned char sha1[20];
                char *ref;
+               const char *display_ref;
+               int flag;
 
                if (e->item->flags & UNINTERESTING)
                        continue;
                if (dwim_ref(e->name, strlen(e->name), sha1, &ref) != 1)
                        continue;
+               if (!resolve_ref(e->name, sha1, 1, &flag))
+                       flag = 0;
+               display_ref = (flag & REF_ISSYMREF) ? e->name : ref;
+
                /*
                 * Make sure the refs we wrote out is correct; --max-count and
                 * other limiting options could have prevented all the tips
@@ -320,7 +315,7 @@ static int create_bundle(struct bundle_header *header, const char *path,
                ref_count++;
                write_or_die(bundle_fd, sha1_to_hex(e->item->sha1), 40);
                write_or_die(bundle_fd, " ", 1);
-               write_or_die(bundle_fd, ref, strlen(ref));
+               write_or_die(bundle_fd, display_ref, strlen(display_ref));
                write_or_die(bundle_fd, "\n", 1);
                free(ref);
        }
@@ -352,6 +347,9 @@ static int create_bundle(struct bundle_header *header, const char *path,
        }
        if (finish_command(&rls))
                return error ("pack-objects died");
+       close(bundle_fd);
+       if (!bundle_to_stdout)
+               commit_lock_file(&lock);
        return 0;
 }