packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

core: checkout: Add --from-file option too 

Easier for debugging if we don't have to redirect stdin.

Conflicts:

	src/ostree/ot-builtin-checkout.c
This commit is contained in:
Colin Walters 2012-05-02 10:21:19 -04:00
parent 0660d9e5cf
commit d040b61d19
1 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/ostree/ot-builtin-checkout.c
View File

@ -35,6 +35,7 @@ static gboolean opt_no_triggers;
static char *opt_subpath; static char *opt_subpath;
static gboolean opt_union; static gboolean opt_union;
static gboolean opt_from_stdin; static gboolean opt_from_stdin;
static char *opt_from_file;
static GOptionEntry options[] = { static GOptionEntry options[] = {
{ "user-mode", 'U', 0, G_OPTION_ARG_NONE, &opt_user_mode, "Do not change file ownership or initialze extended attributes", NULL }, { "user-mode", 'U', 0, G_OPTION_ARG_NONE, &opt_user_mode, "Do not change file ownership or initialze extended attributes", NULL },
@ -43,6 +44,7 @@ static GOptionEntry options[] = {
{ "atomic-retarget", 0, 0, G_OPTION_ARG_NONE, &opt_atomic_retarget, "Make a symbolic link for destination, suffix with checksum", NULL }, { "atomic-retarget", 0, 0, G_OPTION_ARG_NONE, &opt_atomic_retarget, "Make a symbolic link for destination, suffix with checksum", NULL },
{ "no-triggers", 0, 0, G_OPTION_ARG_NONE, &opt_no_triggers, "Don't run triggers", NULL }, { "no-triggers", 0, 0, G_OPTION_ARG_NONE, &opt_no_triggers, "Don't run triggers", NULL },
{ "from-stdin", 0, 0, G_OPTION_ARG_NONE, &opt_from_stdin, "Process many checkouts from standard input", NULL }, { "from-stdin", 0, 0, G_OPTION_ARG_NONE, &opt_from_stdin, "Process many checkouts from standard input", NULL },
{ "from-file", 0, 0, G_OPTION_ARG_STRING, &opt_from_file, "Process many checkouts from input file", NULL },
{ NULL } { NULL }
}; };
@ -162,25 +164,37 @@ process_many_checkouts (OstreeRepo *repo,
gboolean ret = FALSE; gboolean ret = FALSE;
gsize len; gsize len;
GError *temp_error = NULL; GError *temp_error = NULL;
ot_lobj GInputStream *stdin_stream = NULL; ot_lobj GInputStream *instream = NULL;
ot_lobj GDataInputStream *stdin_data = NULL; ot_lobj GDataInputStream *datastream = NULL;
ot_lfree char *revision = NULL; ot_lfree char *revision = NULL;
ot_lfree char *subpath = NULL; ot_lfree char *subpath = NULL;
ot_lfree char *resolved_commit = NULL; ot_lfree char *resolved_commit = NULL;
stdin_stream = (GInputStream*)g_unix_input_stream_new (0, FALSE); if (opt_from_stdin)
stdin_data = g_data_input_stream_new (stdin_stream); {
instream = (GInputStream*)g_unix_input_stream_new (0, FALSE);
}
else
{
ot_lobj GFile *f = ot_gfile_new_for_path (opt_from_file);
while ((revision = g_data_input_stream_read_upto (stdin_data, "", 1, &len, instream = (GInputStream*)g_file_read (f, cancellable, error);
if (!instream)
goto out;
}
datastream = g_data_input_stream_new (instream);
while ((revision = g_data_input_stream_read_upto (datastream, "", 1, &len,
cancellable, &temp_error)) != NULL) cancellable, &temp_error)) != NULL)
{ {
if (revision[0] == '\0') if (revision[0] == '\0')
break; break;
/* Read the null byte */ /* Read the null byte */
(void) g_data_input_stream_read_byte (stdin_data, cancellable, NULL); (void) g_data_input_stream_read_byte (datastream, cancellable, NULL);
g_free (subpath); g_free (subpath);
subpath = g_data_input_stream_read_upto (stdin_data, "", 1, &len, subpath = g_data_input_stream_read_upto (datastream, "", 1, &len,
cancellable, &temp_error); cancellable, &temp_error);
if (temp_error) if (temp_error)
{ {
@ -189,7 +203,7 @@ process_many_checkouts (OstreeRepo *repo,
} }
/* Read the null byte */ /* Read the null byte */
(void) g_data_input_stream_read_byte (stdin_data, cancellable, NULL); (void) g_data_input_stream_read_byte (datastream, cancellable, NULL);
if (!ostree_repo_resolve_rev (repo, revision, FALSE, &resolved_commit, error)) if (!ostree_repo_resolve_rev (repo, revision, FALSE, &resolved_commit, error))
goto out; goto out;
@ -250,12 +264,12 @@ ostree_builtin_checkout (int argc, char **argv, GFile *repo_path, GError **error
goto out; goto out;
} }
if (opt_from_stdin) if (opt_from_stdin || opt_from_file)
{ {
if (opt_atomic_retarget) if (opt_atomic_retarget)
{ {
g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED, g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
"--atomic-retarget may not be used with --from-stdin"); "--atomic-retarget may not be used with --from-stdin or --from-file");
goto out; goto out;
} }