proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-08-04 13:05:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

checkout : reduce memory usage when not filtering

Browse Source
This commit is contained in:
nulltoken 2012-09-17 10:38:57 +02:00
parent 44af67a8b6
commit 5e4cb4f4da
3 changed files with 35 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/checkout.c
View File

@ -59,28 +59,50 @@ static int blob_content_to_file(
unsigned int entry_filemode,
git_checkout_opts *opts)
{
int retcode;
git_buf content = GIT_BUF_INIT;
int file_mode = opts->file_mode;
int error, nb_filters = 0, file_mode = opts->file_mode;
bool dont_free_filtered = false;
git_buf unfiltered = GIT_BUF_INIT, filtered = GIT_BUF_INIT;
git_vector filters = GIT_VECTOR_INIT;
/* Allow disabling of filters */
if (opts->disable_filters)
retcode = git_blob__getbuf(&content, blob);
else
retcode = git_filter_blob_content(&content, blob, path);
if (opts->disable_filters ||
(nb_filters = git_filters_load(
&filters,
git_object_owner((git_object *)blob),
path,
GIT_FILTER_TO_WORKTREE)) == 0) {
if (retcode < 0)
/* Create a fake git_buf from the blob raw data... */
filtered.ptr = blob->odb_object->raw.data;
filtered.size = blob->odb_object->raw.len;
/* ... and make sure it doesn't get unexpectedly freed */
dont_free_filtered = true;
}
if (nb_filters < 0)
return nb_filters;
if (nb_filters > 0) {
if (git_blob__getbuf(&unfiltered, blob) < 0)
goto cleanup;
if ((error = git_filters_apply(&filtered, &unfiltered, &filters)) < 0)
goto cleanup;
}
/* Allow overriding of file mode */
if (!file_mode)
file_mode = entry_filemode;
retcode = buffer_to_file(&content, path, opts->dir_mode, opts->file_open_flags, file_mode);
error = buffer_to_file(&filtered, path, opts->dir_mode, opts->file_open_flags, file_mode);
cleanup:
git_buf_free(&content);
return retcode;
git_filters_free(&filters);
git_buf_free(&unfiltered);
if (!dont_free_filtered)
git_buf_free(&filtered);
return error;
}
static int blob_content_to_link(git_blob *blob, const char *path, bool can_symlink)

19
src/filter.c
View File

@ -164,22 +164,3 @@ int git_filters_apply(git_buf *dest, git_buf *source, git_vector *filters)
return 0;
}
int git_filter_blob_content(git_buf *out, git_blob *blob, const char *hintpath)
{
git_buf unfiltered = GIT_BUF_INIT;
git_vector filters = GIT_VECTOR_INIT;
int retcode;
retcode = git_blob__getbuf(&unfiltered, blob);
git_buf_clear(out);
if (git_filters_load(&filters, git_object_owner((git_object *)blob), hintpath, GIT_FILTER_TO_WORKTREE) >= 0)
retcode = git_filters_apply(out, &unfiltered, &filters);
git_filters_free(&filters);
git_buf_free(&unfiltered);
return retcode;
}

11
src/filter.h
View File

@ -119,15 +119,4 @@ extern void git_text_gather_stats(git_text_stats *stats, const git_buf *text);
*/
extern int git_text_is_binary(git_text_stats *stats);
/**
* Get the content of a blob after all filters have been run.
*
* @param out buffer to receive the contents
* @param hintpath path to the blob's output file, relative to the workdir root.
* Used to determine what git filters should be applied to the content.
* @return 0 on success, an error code otherwise
*/
extern int git_filter_blob_content(git_buf *out, git_blob *blob, const char *hintpath);
#endif