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

core: Allow resolving e.g. "origin/master" as a rev 

Also:

* Disallow .. in revs to avoid looking outside where we should be
* Allow resolving empty revs
This commit is contained in:
Colin Walters 2011-11-17 10:36:04 -05:00
parent aa865bbb83
commit db9801bff2
7 changed files with 79 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
src/libostree/ostree-repo.c
View File

@ -249,8 +249,8 @@ parse_rev_file (OstreeRepo *self,
return ret;
}
static gboolean
resolve_rev (OstreeRepo *self,
gboolean
ostree_repo_resolve_rev (OstreeRepo *self,
const char *rev,
gboolean allow_noent,
char **sha256,
@ -262,16 +262,25 @@ resolve_rev (OstreeRepo *self,
char *tmp2 = NULL;
char *ret_rev = NULL;
GFile *child = NULL;
GFile *origindir = NULL;
char *child_path = NULL;
GError *temp_error = NULL;
GVariant *commit = NULL;
g_return_val_if_fail (rev != NULL, FALSE);
if (strlen (rev) == 0)
{
g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
"Invalid empty rev");
goto out;
}
else if (strstr (rev, "..") != NULL)
{
g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
"Invalid rev %s", rev);
goto out;
}
else if (strlen (rev) == 64)
{
ret_rev = g_strdup (rev);
@ -281,7 +290,7 @@ resolve_rev (OstreeRepo *self,
tmp = g_strdup (rev);
tmp[strlen(tmp) - 1] = '\0';
if (!resolve_rev (self, tmp, allow_noent, &tmp2, error))
if (!ostree_repo_resolve_rev (self, tmp, allow_noent, &tmp2, error))
goto out;
if (!ostree_repo_load_variant_checked (self, OSTREE_SERIALIZED_COMMIT_VARIANT, tmp2, &commit, error))
@ -297,9 +306,34 @@ resolve_rev (OstreeRepo *self,
}
}
else
{
const char *slash = strchr (rev, '/');
if (slash != NULL && (slash == rev || !*(slash+1)))
{
g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
"Invalid rev %s", rev);
goto out;
}
else if (slash == NULL)
{
child = g_file_get_child (priv->local_heads_dir, rev);
child_path = g_file_get_path (child);
}
else
{
const char *rest = slash + 1;
if (strchr (rest, '/'))
{
g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
"Invalid rev %s", rev);
goto out;
}
child = g_file_get_child (priv->remote_heads_dir, rev);
child_path = g_file_get_path (child);
}
if (!ot_util_gfile_load_contents_utf8 (child, NULL, &ret_rev, NULL, &temp_error))
{
if (allow_noent && g_error_matches (temp_error, G_IO_ERROR, G_IO_ERROR_NOT_FOUND))
@ -333,21 +367,12 @@ resolve_rev (OstreeRepo *self,
g_free (tmp);
g_free (tmp2);
g_clear_object (&child);
g_clear_object (&origindir);
g_free (child_path);
g_free (ret_rev);
return ret;
}
gboolean
ostree_repo_resolve_rev (OstreeRepo *self,
const char *rev,
char **sha256,
GError **error)
{
g_return_val_if_fail (rev != NULL, FALSE);
return resolve_rev (self, rev, FALSE, sha256, error);
}
static gboolean
write_checksum_file (GFile *parentdir,
const char *name,
@ -1450,7 +1475,7 @@ ostree_repo_commit_from_filelist_fd (OstreeRepo *self,
if (!import_root (self, base, &root, error))
goto out;
if (!resolve_rev (self, parent, TRUE, &current_head, error))
if (!ostree_repo_resolve_rev (self, parent, TRUE, &current_head, error))
goto out;
in = (GUnixInputStream*)g_unix_input_stream_new (fd, FALSE);
@ -1802,7 +1827,7 @@ ostree_repo_checkout (OstreeRepo *self,
goto out;
}
if (!resolve_rev (self, rev, FALSE, &resolved, error))
if (!ostree_repo_resolve_rev (self, rev, FALSE, &resolved, error))
goto out;
root = (OstreeRepoFile*)_ostree_repo_file_new_root (self, resolved);
@ -2175,7 +2200,7 @@ ostree_repo_read_commit (OstreeRepo *self,
GFile *ret_root = NULL;
char *resolved_rev = NULL;
if (!resolve_rev (self, rev, FALSE, &resolved_rev, error))
if (!ostree_repo_resolve_rev (self, rev, FALSE, &resolved_rev, error))
goto out;
ret_root = _ostree_repo_file_new_root (self, resolved_rev);

1
src/libostree/ostree-repo.h
View File

@ -86,6 +86,7 @@ gboolean ostree_repo_store_object_trusted (OstreeRepo *self,
gboolean ostree_repo_resolve_rev (OstreeRepo *self,
const char *rev,
gboolean allow_noent,
char **out_resolved,
GError **error);

2
src/ostree/ot-builtin-compose.c
View File

@ -187,7 +187,7 @@ compose_branch_on_dir (OstreeRepo *repo,
gboolean ret = FALSE;
char *branchrev = NULL;
if (!ostree_repo_resolve_rev (repo, branch, &branchrev, error))
if (!ostree_repo_resolve_rev (repo, branch, FALSE, &branchrev, error))
goto out;
destpath = g_file_get_path (destination);

2
src/ostree/ot-builtin-log.c
View File

@ -64,7 +64,7 @@ ostree_builtin_log (int argc, char **argv, const char *repo_path, GError **error
if (!ot_util_spawn_pager (&pager, error))
goto out;
if (!ostree_repo_resolve_rev (repo, rev, &resolved_rev, error))
if (!ostree_repo_resolve_rev (repo, rev, FALSE, &resolved_rev, error))
goto out;
while (TRUE)

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

@ -263,6 +263,8 @@ ostree_builtin_pull (int argc, char **argv, const char *repo_path, GError **erro
char *baseurl = NULL;
char *refpath = NULL;
char *temppath = NULL;
char *remote_ref = NULL;
char *original_rev = NULL;
GKeyFile *config = NULL;
SoupURI *base_uri = NULL;
SoupURI *target_uri = NULL;
@ -288,6 +290,11 @@ ostree_builtin_pull (int argc, char **argv, const char *repo_path, GError **erro
remote = argv[1];
branch = argv[2];
remote_ref = g_strdup_printf ("%s/%s", remote, branch);
if (!ostree_repo_resolve_rev (repo, remote_ref, TRUE, &original_rev, error))
goto out;
config = ostree_repo_get_config (repo);
key = g_strdup_printf ("remote \"%s\"", remote);
@ -319,15 +326,24 @@ ostree_builtin_pull (int argc, char **argv, const char *repo_path, GError **erro
goto out;
g_strchomp (rev);
if (original_rev && strcmp (rev, original_rev) == 0)
{
g_print ("No changes in %s\n", remote_ref);
}
else
{
if (!ostree_validate_checksum_string (rev, error))
goto out;
if (!store_commit_recurse (repo, soup, base_uri, rev, error))
goto out;
if (!ostree_repo_write_ref (repo, FALSE, branch, rev, error))
if (!ostree_repo_write_ref (repo, remote, branch, rev, error))
goto out;
g_print ("remote %s is now %s\n", remote_ref, rev);
}
ret = TRUE;
out:
if (context)
@ -337,6 +353,8 @@ ostree_builtin_pull (int argc, char **argv, const char *repo_path, GError **erro
g_free (temppath);
g_free (key);
g_free (rev);
g_free (remote_ref);
g_free (original_rev);
g_free (baseurl);
g_free (refpath);
g_free (remote_branch_ref_path);

2
src/ostree/ot-builtin-rev-parse.c
View File

@ -59,7 +59,7 @@ ostree_builtin_rev_parse (int argc, char **argv, const char *repo_path, GError *
}
rev = argv[1];
if (!ostree_repo_resolve_rev (repo, rev, &resolved_rev, error))
if (!ostree_repo_resolve_rev (repo, rev, FALSE, &resolved_rev, error))
goto out;
g_print ("%s\n", resolved_rev);

4
src/ostree/ot-builtin-show.c
View File

@ -216,7 +216,7 @@ ostree_builtin_show (int argc, char **argv, const char *repo_path, GError **erro
}
else if (print_compose)
{
if (!ostree_repo_resolve_rev (repo, rev, &resolved_rev, error))
if (!ostree_repo_resolve_rev (repo, rev, FALSE, &resolved_rev, error))
goto out;
if (!do_print_compose (repo, rev, resolved_rev, error))
@ -229,7 +229,7 @@ ostree_builtin_show (int argc, char **argv, const char *repo_path, GError **erro
}
else
{
if (!ostree_repo_resolve_rev (repo, rev, &resolved_rev, error))
if (!ostree_repo_resolve_rev (repo, rev, FALSE, &resolved_rev, error))
goto out;
if (!show_repo_meta (repo, rev, resolved_rev, error))