Merge branch 'md/list-objects-filter-combo'
[gitweb.git] / vcs-svn / fast_export.c
index 5bd455b8c88e0b7a1340f2791b82b3fab5270218..b5b8913cb0f2ceae60c18123d979e2948c568151 100644 (file)
@@ -67,12 +67,12 @@ void fast_export_modify(const char *path, uint32_t mode, const char *dataref)
 }
 
 void fast_export_begin_note(uint32_t revision, const char *author,
-               const char *log, unsigned long timestamp, const char *note_ref)
+               const char *log, timestamp_t timestamp, const char *note_ref)
 {
        static int firstnote = 1;
        size_t loglen = strlen(log);
        printf("commit %s\n", note_ref);
-       printf("committer %s <%s@%s> %lu +0000\n", author, author, "local", timestamp);
+       printf("committer %s <%s@%s> %"PRItime" +0000\n", author, author, "local", timestamp);
        printf("data %"PRIuMAX"\n", (uintmax_t)loglen);
        fwrite(log, loglen, 1, stdout);
        if (firstnote) {
@@ -92,7 +92,7 @@ static char gitsvnline[MAX_GITSVN_LINE_LEN];
 void fast_export_begin_commit(uint32_t revision, const char *author,
                        const struct strbuf *log,
                        const char *uuid, const char *url,
-                       unsigned long timestamp, const char *local_ref)
+                       timestamp_t timestamp, const char *local_ref)
 {
        static const struct strbuf empty = STRBUF_INIT;
        if (!log)
@@ -106,7 +106,7 @@ void fast_export_begin_commit(uint32_t revision, const char *author,
        }
        printf("commit %s\n", local_ref);
        printf("mark :%"PRIu32"\n", revision);
-       printf("committer %s <%s@%s> %lu +0000\n",
+       printf("committer %s <%s@%s> %"PRItime" +0000\n",
                   *author ? author : "nobody",
                   *author ? author : "nobody",
                   *uuid ? uuid : "local", timestamp);
@@ -320,7 +320,8 @@ const char *fast_export_read_path(const char *path, uint32_t *mode_out)
        err = fast_export_ls(path, mode_out, &buf);
        if (err) {
                if (errno != ENOENT)
-                       die_errno("BUG: unexpected fast_export_ls error");
+                       BUG("unexpected fast_export_ls error: %s",
+                           strerror(errno));
                /* Treat missing paths as directories. */
                *mode_out = S_IFDIR;
                return NULL;
@@ -338,7 +339,8 @@ void fast_export_copy(uint32_t revision, const char *src, const char *dst)
        err = fast_export_ls_rev(revision, src, &mode, &data);
        if (err) {
                if (errno != ENOENT)
-                       die_errno("BUG: unexpected fast_export_ls_rev error");
+                       BUG("unexpected fast_export_ls_rev error: %s",
+                           strerror(errno));
                fast_export_delete(dst);
                return;
        }