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

pull: Add remotename:ref syntax 

This is really the common case.
This commit is contained in:
Colin Walters 2014-01-21 08:57:34 +00:00
parent 35c1fe324f
commit 390b781d3a
2 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/ostree/ot-builtin-pull.c
View File

@ -36,7 +36,7 @@ ostree_builtin_pull (int argc, char **argv, OstreeRepo *repo, GCancellable *canc
{ {
GOptionContext *context; GOptionContext *context;
gboolean ret = FALSE; gboolean ret = FALSE;
const char *remote; gs_free char *remote = NULL;
OstreeRepoPullFlags pullflags = 0; OstreeRepoPullFlags pullflags = 0;
GSConsole *console = NULL; GSConsole *console = NULL;
gs_unref_ptrarray GPtrArray *refs_to_fetch = NULL; gs_unref_ptrarray GPtrArray *refs_to_fetch = NULL;
@ -53,14 +53,28 @@ ostree_builtin_pull (int argc, char **argv, OstreeRepo *repo, GCancellable *canc
ot_util_usage_error (context, "REMOTE must be specified", error); ot_util_usage_error (context, "REMOTE must be specified", error);
goto out; goto out;
} }
remote = argv[1];
if (argc > 2)
if (strchr (argv[1], ':') == NULL)
{ {
int i; remote = g_strdup (argv[1]);
if (argc > 2)
{
int i;
refs_to_fetch = g_ptr_array_new ();
for (i = 2; i < argc; i++)
g_ptr_array_add (refs_to_fetch, argv[i]);
g_ptr_array_add (refs_to_fetch, NULL);
}
}
else
{
char *ref_to_fetch;
refs_to_fetch = g_ptr_array_new (); refs_to_fetch = g_ptr_array_new ();
for (i = 2; i < argc; i++) if (!ostree_parse_refspec (argv[1], &remote, &ref_to_fetch, error))
g_ptr_array_add (refs_to_fetch, argv[i]); goto out;
/* Transfer ownership */
g_ptr_array_add (refs_to_fetch, ref_to_fetch);
g_ptr_array_add (refs_to_fetch, NULL); g_ptr_array_add (refs_to_fetch, NULL);
} }

2
tests/pull-test.sh
View File

@ -23,7 +23,9 @@ cd ${test_tmpdir}
mkdir repo mkdir repo
${CMD_PREFIX} ostree --repo=repo init ${CMD_PREFIX} ostree --repo=repo init
${CMD_PREFIX} ostree --repo=repo remote add --set=gpg-verify=false origin $(cat httpd-address)/ostree/gnomerepo ${CMD_PREFIX} ostree --repo=repo remote add --set=gpg-verify=false origin $(cat httpd-address)/ostree/gnomerepo
# Try both syntaxes
${CMD_PREFIX} ostree --repo=repo pull origin main ${CMD_PREFIX} ostree --repo=repo pull origin main
${CMD_PREFIX} ostree --repo=repo pull origin:main
${CMD_PREFIX} ostree --repo=repo fsck ${CMD_PREFIX} ostree --repo=repo fsck
echo "ok pull" echo "ok pull"