mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jc/stream-to-pack'

Browse Source 
* jc/stream-to-pack:
  bulk-checkin: replace fast-import based implementation
  csum-file: introduce sha1file_checkpoint
  finish_tmp_packfile(): a helper function
  create_tmp_packfile(): a helper function
  write_pack_header(): a helper function

Conflicts:
	pack.h
This commit is contained in:
Junio C Hamano
2011-12-16 22:33:40 -08:00
parent e45c9b03c3 568508e765
commit 48b303675a
16 changed files with 515 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
sha1_file.c
View File

@ -18,6 +18,7 @@
#include "refs.h"
#include "pack-revindex.h"
#include "sha1-lookup.h"
#include "bulk-checkin.h"
#ifndef O_NOATIME
#if defined(__linux__) && (defined(__i386__) || defined(__PPC__))
@ -2680,10 +2681,8 @@ static int index_core(unsigned char *sha1, int fd, size_t size,
}
/*
* This creates one packfile per large blob, because the caller
* immediately wants the result sha1, and fast-import can report the
* object name via marks mechanism only by closing the created
* packfile.
* This creates one packfile per large blob unless bulk-checkin
* machinery is "plugged".
*
* This also bypasses the usual "convert-to-git" dance, and that is on
* purpose. We could write a streaming version of the converting
@ -2697,65 +2696,7 @@ static int index_stream(unsigned char *sha1, int fd, size_t size,
enum object_type type, const char *path,
unsigned flags)
{
struct child_process fast_import;
char export_marks[512];
const char *argv[] = { "fast-import", "--quiet", export_marks, NULL };
char tmpfile[512];
char fast_import_cmd[512];
char buf[512];
int len, tmpfd;
strcpy(tmpfile, git_path("hashstream_XXXXXX"));
tmpfd = git_mkstemp_mode(tmpfile, 0600);
if (tmpfd < 0)
die_errno("cannot create tempfile: %s", tmpfile);
if (close(tmpfd))
die_errno("cannot close tempfile: %s", tmpfile);
sprintf(export_marks, "--export-marks=%s", tmpfile);
memset(&fast_import, 0, sizeof(fast_import));
fast_import.in = -1;
fast_import.argv = argv;
fast_import.git_cmd = 1;
if (start_command(&fast_import))
die_errno("index-stream: git fast-import failed");
len = sprintf(fast_import_cmd, "blob\nmark :1\ndata %lu\n",
(unsigned long) size);
write_or_whine(fast_import.in, fast_import_cmd, len,
"index-stream: feeding fast-import");
while (size) {
char buf[10240];
size_t sz = size < sizeof(buf) ? size : sizeof(buf);
ssize_t actual;
actual = read_in_full(fd, buf, sz);
if (actual < 0)
die_errno("index-stream: reading input");
if (write_in_full(fast_import.in, buf, actual) != actual)
die_errno("index-stream: feeding fast-import");
size -= actual;
}
if (close(fast_import.in))
die_errno("index-stream: closing fast-import");
if (finish_command(&fast_import))
die_errno("index-stream: finishing fast-import");
tmpfd = open(tmpfile, O_RDONLY);
if (tmpfd < 0)
die_errno("index-stream: cannot open fast-import mark");
len = read(tmpfd, buf, sizeof(buf));
if (len < 0)
die_errno("index-stream: reading fast-import mark");
if (close(tmpfd) < 0)
die_errno("index-stream: closing fast-import mark");
if (unlink(tmpfile))
die_errno("index-stream: unlinking fast-import mark");
if (len != 44 ||
memcmp(":1 ", buf, 3) ||
get_sha1_hex(buf + 3, sha1))
die_errno("index-stream: unexpected fast-import mark: <%s>", buf);
return 0;
return index_bulk_checkin(sha1, fd, size, type, path, flags);
}
int index_fd(unsigned char *sha1, int fd, struct stat *st,