Commit 5e4cb4f4da0baef99683be95cb5eeb5288d8ba84
2012-09-17T10:38:57
checkout : reduce memory usage when not filtering
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115
diff --git a/src/checkout.c b/src/checkout.c
index c39bccb..30799b6 100644
--- a/src/checkout.c
+++ b/src/checkout.c
@@ -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;
+
+ if (opts->disable_filters ||
+ (nb_filters = git_filters_load(
+ &filters,
+ git_object_owner((git_object *)blob),
+ path,
+ GIT_FILTER_TO_WORKTREE)) == 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;
+ }
- /* Allow disabling of filters */
- if (opts->disable_filters)
- retcode = git_blob__getbuf(&content, blob);
- else
- retcode = git_filter_blob_content(&content, blob, path);
+ if (nb_filters < 0)
+ return nb_filters;
- if (retcode < 0)
- goto cleanup;
+ 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)
diff --git a/src/filter.c b/src/filter.c
index 5b6bb28..28a0523 100644
--- a/src/filter.c
+++ b/src/filter.c
@@ -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;
-}
diff --git a/src/filter.h b/src/filter.h
index d58e173..b9beb49 100644
--- a/src/filter.h
+++ b/src/filter.h
@@ -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