proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-08-14 16:07:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1614 from schu/packbuilder-write

Browse Source 
packbuilder: also write index in git_packbuilder_write
This commit is contained in:
Vicent Martí 2013-05-27 06:15:28 -07:00
commit 8baca134cc
2 changed files with 45 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/git2/pack.h
View File

@ -107,14 +107,20 @@ GIT_EXTERN(int) git_packbuilder_insert_tree(git_packbuilder *pb, const git_oid *
GIT_EXTERN(int) git_packbuilder_insert_commit(git_packbuilder *pb, const git_oid *id); GIT_EXTERN(int) git_packbuilder_insert_commit(git_packbuilder *pb, const git_oid *id);
/** /**
* Write the new pack and the corresponding index to path * Write the new pack and corresponding index file to path.
* *
* @param pb The packbuilder * @param pb The packbuilder
* @param path Directory to store the new pack and index * @param path to the directory where the packfile and index should be stored
* @param progress_cb function to call with progress information from the indexer (optional)
* @param progress_payload payload for the progress callback (optional)
* *
* @return 0 or an error code * @return 0 or an error code
*/ */
GIT_EXTERN(int) git_packbuilder_write(git_packbuilder *pb, const char *file); GIT_EXTERN(int) git_packbuilder_write(
git_packbuilder *pb,
const char *path,
git_transfer_progress_callback progress_cb,
void *progress_cb_payload);
typedef int (*git_packbuilder_foreach_cb)(void *buf, size_t size, void *payload); typedef int (*git_packbuilder_foreach_cb)(void *buf, size_t size, void *payload);
/** /**

58
src/pack-objects.c
View File

@ -33,6 +33,11 @@ struct tree_walk_context {
git_buf buf; git_buf buf;
}; };
struct pack_write_context {
git_indexer_stream *indexer;
git_transfer_progress *stats;
};
#ifdef GIT_THREADS #ifdef GIT_THREADS
#define GIT_PACKBUILDER__MUTEX_OP(pb, mtx, op) do { \ #define GIT_PACKBUILDER__MUTEX_OP(pb, mtx, op) do { \
@ -620,26 +625,6 @@ static int write_pack_buf(void *buf, size_t size, void *data)
return git_buf_put(b, buf, size); return git_buf_put(b, buf, size);
} }
static int write_pack_to_file(void *buf, size_t size, void *data)
{
git_filebuf *file = (git_filebuf *)data;
return git_filebuf_write(file, buf, size);
}
static int write_pack_file(git_packbuilder *pb, const char *path)
{
git_filebuf file = GIT_FILEBUF_INIT;
if (git_filebuf_open(&file, path, 0) < 0 ||
write_pack(pb, &write_pack_to_file, &file) < 0 ||
git_filebuf_commit(&file, GIT_PACK_FILE_MODE) < 0) {
git_filebuf_cleanup(&file);
return -1;
}
return 0;
}
static int type_size_sort(const void *_a, const void *_b) static int type_size_sort(const void *_a, const void *_b)
{ {
const git_pobject *a = (git_pobject *)_a; const git_pobject *a = (git_pobject *)_a;
@ -1259,10 +1244,39 @@ int git_packbuilder_write_buf(git_buf *buf, git_packbuilder *pb)
return write_pack(pb, &write_pack_buf, buf); return write_pack(pb, &write_pack_buf, buf);
} }
int git_packbuilder_write(git_packbuilder *pb, const char *path) static int write_cb(void *buf, size_t len, void *payload)
{ {
struct pack_write_context *ctx = payload;
return git_indexer_stream_add(ctx->indexer, buf, len, ctx->stats);
}
int git_packbuilder_write(
git_packbuilder *pb,
const char *path,
git_transfer_progress_callback progress_cb,
void *progress_cb_payload)
{
git_indexer_stream *indexer;
git_transfer_progress stats;
struct pack_write_context ctx;
PREPARE_PACK; PREPARE_PACK;
return write_pack_file(pb, path);
if (git_indexer_stream_new(
&indexer, path, progress_cb, progress_cb_payload) < 0)
return -1;
ctx.indexer = indexer;
ctx.stats = &stats;
if (git_packbuilder_foreach(pb, write_cb, &ctx) < 0 ||
git_indexer_stream_finalize(indexer, &stats) < 0) {
git_indexer_stream_free(indexer);
return -1;
}
git_indexer_stream_free(indexer);
return 0;
} }
#undef PREPARE_PACK #undef PREPARE_PACK