proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-10-15 23:17:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Checkout: implementation of most options

Browse Source
This commit is contained in:
Ben Straub 2012-07-26 16:31:49 -07:00
parent b401bace1b
commit 095ccc013f
2 changed files with 48 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/git2/checkout.h
View File

@ -30,7 +30,8 @@ typedef struct git_checkout_opts {
int existing_file_action; /* default: GIT_CHECKOUT_OVERWRITE_EXISTING */ int existing_file_action; /* default: GIT_CHECKOUT_OVERWRITE_EXISTING */
int disable_filters; int disable_filters;
int dir_mode; /* default is 0755 */ int dir_mode; /* default is 0755 */
int file_open_mode; /* default is O_CREAT | O_TRUNC | O_WRONLY */ int file_mode; /* default is 0644 */
int file_open_flags; /* default is O_CREAT | O_TRUNC | O_WRONLY */
} git_checkout_opts; } git_checkout_opts;
/** /**

63
src/checkout.c
View File

@ -61,25 +61,43 @@ static int blob_contents_to_link(tree_walk_data *data, git_buf *fnbuf,
static int blob_contents_to_file(git_repository *repo, git_buf *fnbuf, static int blob_contents_to_file(git_repository *repo, git_buf *fnbuf,
const git_oid *id, int mode) const git_oid *id, tree_walk_data *data)
{ {
int retcode = GIT_ERROR; int retcode = GIT_ERROR;
git_buf contents = GIT_BUF_INIT;
git_buf filteredcontents = GIT_BUF_INIT; /* Allow disabling of filters */
if (!git_filter_blob_contents(&filteredcontents, repo, id, git_buf_cstr(fnbuf))) { if (data->opts->disable_filters) {
int fd = git_futils_creat_withpath(git_buf_cstr(fnbuf), git_blob *blob;
GIT_DIR_MODE, mode); if (!(retcode = git_blob_lookup(&blob, repo, id))) {
if (fd >= 0) { retcode = git_blob__getbuf(&contents, blob);
if (!p_write(fd, git_buf_cstr(&filteredcontents), git_blob_free(blob);
git_buf_len(&filteredcontents)))
retcode = 0;
else
retcode = GIT_ERROR;
p_close(fd);
} }
} else {
retcode = git_filter_blob_contents(&contents, repo, id, git_buf_cstr(fnbuf));
} }
git_buf_free(&filteredcontents); if (retcode < 0) goto bctf_cleanup;
/* Deal with pre-existing files */
if (git_path_exists(git_buf_cstr(fnbuf)) &&
data->opts->existing_file_action == GIT_CHECKOUT_SKIP_EXISTING)
goto bctf_cleanup;
/* TODO: use p_open with flags */
int fd = git_futils_creat_withpath(git_buf_cstr(fnbuf),
data->opts->dir_mode,
data->opts->file_mode);
if (fd >= 0) {
if (!p_write(fd, git_buf_cstr(&contents),
git_buf_len(&contents)))
retcode = 0;
else
retcode = GIT_ERROR;
p_close(fd);
}
bctf_cleanup:
git_buf_free(&contents);
return retcode; return retcode;
} }
@ -111,7 +129,7 @@ static int checkout_walker(const char *path, const git_tree_entry *entry, void *
git_tree_entry_id(entry)); git_tree_entry_id(entry));
} else { } else {
retcode = blob_contents_to_file(data->repo, &fnbuf, retcode = blob_contents_to_file(data->repo, &fnbuf,
git_tree_entry_id(entry), attr); git_tree_entry_id(entry), data);
} }
break; break;
@ -139,6 +157,16 @@ int git_checkout_index(git_repository *repo, git_checkout_opts *opts, git_indexe
if (!opts) opts = &default_opts; if (!opts) opts = &default_opts;
if (!stats) stats = &dummy_stats; if (!stats) stats = &dummy_stats;
/* Default options */
if (!opts->existing_file_action)
opts->existing_file_action = GIT_CHECKOUT_OVERWRITE_EXISTING;
/* opts->disable_filters is false by default */
if (!opts->dir_mode) opts->dir_mode = GIT_DIR_MODE;
if (!opts->file_mode)
opts->file_mode = 0644;
if (!opts->file_open_flags)
opts->file_open_flags = O_CREAT | O_TRUNC | O_WRONLY;
if (git_repository_is_bare(repo)) { if (git_repository_is_bare(repo)) {
giterr_set(GITERR_INVALID, "Checkout is not allowed for bare repositories"); giterr_set(GITERR_INVALID, "Checkout is not allowed for bare repositories");
return GIT_ERROR; return GIT_ERROR;
@ -159,7 +187,7 @@ int git_checkout_index(git_repository *repo, git_checkout_opts *opts, git_indexe
payload.repo = repo; payload.repo = repo;
if (git_repository_odb(&payload.odb, repo) < 0) return GIT_ERROR; if (git_repository_odb(&payload.odb, repo) < 0) return GIT_ERROR;
/* TODO: stats.total is never calculated. */ /* TODO: stats->total is never calculated. */
if (!git_repository_head_tree(&tree, repo)) { if (!git_repository_head_tree(&tree, repo)) {
/* Checkout the files */ /* Checkout the files */
@ -176,8 +204,9 @@ int git_checkout_index(git_repository *repo, git_checkout_opts *opts, git_indexe
int git_checkout_head(git_repository *repo, git_checkout_opts *opts, git_indexer_stats *stats) int git_checkout_head(git_repository *repo, git_checkout_opts *opts, git_indexer_stats *stats)
{ {
/* TODO */ /* TODO: read HEAD into index */
return -1;
return git_checkout_index(repo, opts, stats);
} }