Merge branch 'master' of git://repo.or.cz/git/fastimport

* 'master' of git://repo.or.cz/git/fastimport:
Allow fast-import frontends to reload the marks table
Use atomic updates to the fast-import mark file
Preallocate memory earlier in fast-import

diff --combined fast-import.c
index fda50188eaf96d6450e802f54945f86a0776cf6f,fbed8e4e89cb5cd8bb1d8f666de8a19c71912136..726f5ba7d2a8b16e0fb62846f3ede631d99486d3
--- 1/fast-import.c
--- 2/fast-import.c
+++ b/fast-import.c
@@@ -133,6 -133,10 +133,6 @@@ Format of STDIN stream
  #define PACK_ID_BITS 16
  #define MAX_PACK_ID ((1<<PACK_ID_BITS)-1)
  
 -#ifndef PRIuMAX
 -#define PRIuMAX "llu"
 -#endif
 -
  struct object_entry
  {
        struct object_entry *next;
@@@ -249,7 -253,7 +249,7 @@@ typedef enum 
  
  /* Configured limits on output */
  static unsigned long max_depth = 10;
 -static unsigned long max_packsize = (1LL << 32) - 1;
 +static off_t max_packsize = (1LL << 32) - 1;
  static int force_update;
  
  /* Stats and misc. counters */
@@@ -753,7 -757,7 +753,7 @@@ static char *create_index(void
  static char *keep_pack(char *curr_index_name)
  {
        static char name[PATH_MAX];
 -      static char *keep_msg = "fast-import";
 +      static const char *keep_msg = "fast-import";
        int keep_fd;
  
        chmod(pack_data->pack_name, 0444);
@@@ -1371,16 -1375,33 +1371,33 @@@ static void dump_marks_helper(FILE *f
  
  static void dump_marks(void)
  {
-       if (mark_file)
-       {
-               FILE *f = fopen(mark_file, "w");
-               if (f) {
-                       dump_marks_helper(f, 0, marks);
-                       fclose(f);
-               } else
-                       failure |= error("Unable to write marks file %s: %s",
-                               mark_file, strerror(errno));
+       static struct lock_file mark_lock;
+       int mark_fd;
+       FILE *f;
+ 
+       if (!mark_file)
+               return;
+ 
+       mark_fd = hold_lock_file_for_update(&mark_lock, mark_file, 0);
+       if (mark_fd < 0) {
+               failure |= error("Unable to write marks file %s: %s",
+                       mark_file, strerror(errno));
+               return;
+       }
+ 
+       f = fdopen(mark_fd, "w");
+       if (!f) {
+               rollback_lock_file(&mark_lock);
+               failure |= error("Unable to write marks file %s: %s",
+                       mark_file, strerror(errno));
+               return;
        }
+ 
+       dump_marks_helper(f, 0, marks);
+       fclose(f);
+       if (commit_lock_file(&mark_lock))
+               failure |= error("Unable to write marks file %s: %s",
+                       mark_file, strerror(errno));
  }
  
  static void read_next_command(void)
@@@ -1527,7 -1548,7 +1544,7 @@@ static void unload_one_branch(void
  {
        while (cur_active_branches
                && cur_active_branches >= max_active_branches) {
 -              unsigned long min_commit = ULONG_MAX;
 +              uintmax_t min_commit = ULONG_MAX;
                struct branch *e, *l = NULL, *p = NULL;
  
                for (e = active_branches; e; e = e->active_next_branch) {
@@@ -1976,6 -1997,40 +1993,40 @@@ static void cmd_checkpoint(void
        read_next_command();
  }
  
+ static void import_marks(const char *input_file)
+ {
+       char line[512];
+       FILE *f = fopen(input_file, "r");
+       if (!f)
+               die("cannot read %s: %s", input_file, strerror(errno));
+       while (fgets(line, sizeof(line), f)) {
+               uintmax_t mark;
+               char *end;
+               unsigned char sha1[20];
+               struct object_entry *e;
+ 
+               end = strchr(line, '\n');
+               if (line[0] != ':' || !end)
+                       die("corrupt mark line: %s", line);
+               *end = 0;
+               mark = strtoumax(line + 1, &end, 10);
+               if (!mark || end == line + 1
+                       || *end != ' ' || get_sha1(end + 1, sha1))
+                       die("corrupt mark line: %s", line);
+               e = find_object(sha1);
+               if (!e) {
+                       enum object_type type = sha1_object_info(sha1, NULL);
+                       if (type < 0)
+                               die("object not found: %s", sha1_to_hex(sha1));
+                       e = insert_object(sha1);
+                       e->type = type;
+                       e->pack_id = MAX_PACK_ID;
+               }
+               insert_mark(mark, e);
+       }
+       fclose(f);
+ }
+ 
  static const char fast_import_usage[] =
  "git-fast-import [--date-format=f] [--max-pack-size=n] [--depth=n] [--active-branches=n] [--export-marks=marks.file]";
  
@@@ -1984,6 -2039,12 +2035,12 @@@ int main(int argc, const char **argv
        int i, show_stats = 1;
  
        git_config(git_default_config);
+       alloc_objects(object_entry_alloc);
+       strbuf_init(&command_buf);
+       atom_table = xcalloc(atom_table_sz, sizeof(struct atom_str*));
+       branch_table = xcalloc(branch_table_sz, sizeof(struct branch*));
+       avail_tree_table = xcalloc(avail_tree_table_sz, sizeof(struct avail_tree_content*));
+       marks = pool_calloc(1, sizeof(struct mark_set));
  
        for (i = 1; i < argc; i++) {
                const char *a = argv[i];
@@@ -2007,6 -2068,8 +2064,8 @@@
                        max_depth = strtoul(a + 8, NULL, 0);
                else if (!prefixcmp(a, "--active-branches="))
                        max_active_branches = strtoul(a + 18, NULL, 0);
+               else if (!prefixcmp(a, "--import-marks="))
+                       import_marks(a + 15);
                else if (!prefixcmp(a, "--export-marks="))
                        mark_file = a + 15;
                else if (!prefixcmp(a, "--export-pack-edges=")) {
@@@ -2027,14 -2090,6 +2086,6 @@@
        if (i != argc)
                usage(fast_import_usage);
  
-       alloc_objects(object_entry_alloc);
-       strbuf_init(&command_buf);
- 
-       atom_table = xcalloc(atom_table_sz, sizeof(struct atom_str*));
-       branch_table = xcalloc(branch_table_sz, sizeof(struct branch*));
-       avail_tree_table = xcalloc(avail_tree_table_sz, sizeof(struct avail_tree_content*));
-       marks = pool_calloc(1, sizeof(struct mark_set));
- 
        start_packfile();
        for (;;) {
                read_next_command();