diff options
| author | Ben Straub <bstraub@github.com> | 2012-07-26 13:12:21 -0700 |
|---|---|---|
| committer | Ben Straub <bstraub@github.com> | 2012-07-26 13:12:21 -0700 |
| commit | b401bace1b28ac23990382605791eddbeda09d9b (patch) | |
| tree | c6611b78a99a3fdcbac9084deac2ab397b6fe639 /src | |
| parent | ef9905c9902a9ffad71c8acddec74dc0d8e866de (diff) | |
| download | libgit2-b401bace1b28ac23990382605791eddbeda09d9b.tar.gz | |
Restructure for better checkout options
* Removed the #define for defaults
* Promoted progress structure to top-level API call
argument
Diffstat (limited to 'src')
| -rw-r--r-- | src/checkout.c | 16 | ||||
| -rw-r--r-- | src/clone.c | 3 |
2 files changed, 12 insertions, 7 deletions
diff --git a/src/checkout.c b/src/checkout.c index d5f69c648..342a1ba8d 100644 --- a/src/checkout.c +++ b/src/checkout.c @@ -27,6 +27,7 @@ GIT_BEGIN_DECL typedef struct tree_walk_data { + git_indexer_stats *stats; git_checkout_opts *opts; git_repository *repo; git_odb *odb; @@ -120,21 +121,23 @@ static int checkout_walker(const char *path, const git_tree_entry *entry, void * } git_buf_free(&fnbuf); - data->opts->stats.processed++; + data->stats->processed++; return retcode; } -int git_checkout_index(git_repository *repo, git_checkout_opts *opts) +int git_checkout_index(git_repository *repo, git_checkout_opts *opts, git_indexer_stats *stats) { int retcode = GIT_ERROR; - git_checkout_opts default_opts = GIT_CHECKOUT_DEFAULT_OPTS; + git_indexer_stats dummy_stats; + git_checkout_opts default_opts = {0}; git_tree *tree; tree_walk_data payload; git_config *cfg; assert(repo); if (!opts) opts = &default_opts; + if (!stats) stats = &dummy_stats; if (git_repository_is_bare(repo)) { giterr_set(GITERR_INVALID, "Checkout is not allowed for bare repositories"); @@ -150,12 +153,13 @@ int git_checkout_index(git_repository *repo, git_checkout_opts *opts) git_config_free(cfg); } - opts->stats.total = opts->stats.processed = 0; + stats->total = stats->processed = 0; + payload.stats = stats; payload.opts = opts; payload.repo = repo; if (git_repository_odb(&payload.odb, repo) < 0) return GIT_ERROR; - /* TODO: opts->stats.total is never calculated. */ + /* TODO: stats.total is never calculated. */ if (!git_repository_head_tree(&tree, repo)) { /* Checkout the files */ @@ -170,7 +174,7 @@ int git_checkout_index(git_repository *repo, git_checkout_opts *opts) } -int git_checkout_head(git_repository *repo, git_checkout_opts *opts) +int git_checkout_head(git_repository *repo, git_checkout_opts *opts, git_indexer_stats *stats) { /* TODO */ return -1; diff --git a/src/clone.c b/src/clone.c index 7ce391136..47bd16d84 100644 --- a/src/clone.c +++ b/src/clone.c @@ -250,6 +250,7 @@ int git_clone(git_repository **out, const char *origin_url, const char *workdir_path, git_indexer_stats *fetch_stats, + git_indexer_stats *checkout_stats, git_checkout_opts *checkout_opts) { int retcode = GIT_ERROR; @@ -257,7 +258,7 @@ int git_clone(git_repository **out, assert(out && origin_url && workdir_path); if (!(retcode = clone_internal(out, origin_url, workdir_path, fetch_stats, 0))) { - retcode = git_checkout_head(*out, checkout_opts); + retcode = git_checkout_head(*out, checkout_opts, checkout_stats); } return retcode; |