shaba/ostree
1
0
Fork 0
mirror of https://github.com/ostreedev/ostree.git synced 2024-12-22 17:35:55 +03:00
Code Issues Projects Releases Wiki Activity

Save root directory permissions in commit

Browse Source
This commit is contained in:
Colin Walters 2011-10-15 14:20:22 -04:00
parent c768c2a746
commit 717945814c
2 changed files with 110 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/libhacktree/hacktree-core.h
View File

@ -74,13 +74,14 @@ typedef enum {
* Commit objects: * Commit objects:
* u - Version * u - Version
* a{sv} - Metadata * a{sv} - Metadata
* s - parent checksum * s - parent checksum (empty string for initial)
* s - subject * s - subject
* s - body * s - body
* t - Timestamp in seconds since the epoch (UTC) * t - Timestamp in seconds since the epoch (UTC)
* s - Tree SHA256 * s - Root tree contents
* s - Root tree metadata
*/ */
#define HACKTREE_COMMIT_GVARIANT_FORMAT "(ua{sv}sssts)" #define HACKTREE_COMMIT_GVARIANT_FORMAT "(ua{sv}ssstss)"
GVariant *hacktree_get_xattrs_for_path (const char *path, GVariant *hacktree_get_xattrs_for_path (const char *path,
GError **error); GError **error);

150
src/libhacktree/hacktree-repo.c
View File

@ -751,14 +751,18 @@ static gboolean
load_commit_and_trees (HacktreeRepo *self, load_commit_and_trees (HacktreeRepo *self,
const char *commit_sha256, const char *commit_sha256,
GVariant **out_commit, GVariant **out_commit,
ParsedTreeData **out_tree_data, ParsedDirectoryData **out_root_data,
GError **error) GError **error)
{ {
HacktreeRepoPrivate *priv = GET_PRIVATE (self); HacktreeRepoPrivate *priv = GET_PRIVATE (self);
GVariant *ret_commit = NULL; GVariant *ret_commit = NULL;
ParsedTreeData *ret_tree_data = NULL; ParsedDirectoryData *ret_root_data = NULL;
ParsedTreeData *tree_data = NULL;
char *ret_metadata_checksum = NULL;
GVariant *root_metadata = NULL;
gboolean ret = FALSE; gboolean ret = FALSE;
const char *tree_checksum; const char *tree_contents_checksum;
const char *tree_meta_checksum;
if (!priv->current_head) if (!priv->current_head)
{ {
@ -771,24 +775,34 @@ load_commit_and_trees (HacktreeRepo *self,
commit_sha256, &ret_commit, error)) commit_sha256, &ret_commit, error))
goto out; goto out;
g_variant_get_child (ret_commit, 6, "&s", &tree_checksum); g_variant_get_child (ret_commit, 6, "&s", &tree_contents_checksum);
g_variant_get_child (ret_commit, 7, "&s", &tree_meta_checksum);
if (!parse_tree (self, tree_checksum, &ret_tree_data, error)) if (!load_gvariant_object (self, HACKTREE_SERIALIZED_DIRMETA_VARIANT,
tree_meta_checksum, &root_metadata, error))
goto out; goto out;
if (!parse_tree (self, tree_contents_checksum, &tree_data, error))
goto out;
ret_root_data = g_new0 (ParsedDirectoryData, 1);
ret_root_data->tree_data = tree_data;
ret_root_data->metadata_sha256 = g_strdup (tree_meta_checksum);
ret_root_data->meta_data = root_metadata;
root_metadata = NULL;
ret = TRUE; ret = TRUE;
*out_commit = ret_commit;
ret_commit = NULL;
*out_root_data = ret_root_data;
ret_root_data = NULL;
out: out:
if (!ret) if (ret_commit)
{ g_variant_unref (ret_commit);
if (ret_commit) parsed_directory_data_free (ret_root_data);
g_variant_unref (ret_commit); g_free (ret_metadata_checksum);
parsed_tree_data_free (ret_tree_data); if (root_metadata)
} g_variant_unref (root_metadata);
else
{
*out_commit = ret_commit;
*out_tree_data = ret_tree_data;
}
return ret; return ret;
} }
@ -1210,7 +1224,7 @@ commit_parsed_tree (HacktreeRepo *self,
const char *subject, const char *subject,
const char *body, const char *body,
GVariant *metadata, GVariant *metadata,
ParsedTreeData *tree, ParsedDirectoryData *root,
GChecksum **out_commit, GChecksum **out_commit,
GError **error) GError **error)
{ {
@ -1221,17 +1235,18 @@ commit_parsed_tree (HacktreeRepo *self,
GVariant *commit = NULL; GVariant *commit = NULL;
GDateTime *now = NULL; GDateTime *now = NULL;
if (!import_parsed_tree (self, tree, &root_checksum, error)) if (!import_parsed_tree (self, root->tree_data, &root_checksum, error))
goto out; goto out;
now = g_date_time_new_now_utc (); now = g_date_time_new_now_utc ();
commit = g_variant_new ("(u@a{sv}sssts)", commit = g_variant_new ("(u@a{sv}ssstss)",
HACKTREE_COMMIT_VERSION, HACKTREE_COMMIT_VERSION,
create_empty_gvariant_dict (), create_empty_gvariant_dict (),
priv->current_head ? priv->current_head : "", priv->current_head ? priv->current_head : "",
subject, body ? body : "", subject, body ? body : "",
g_date_time_to_unix (now) / G_TIME_SPAN_SECOND, g_date_time_to_unix (now) / G_TIME_SPAN_SECOND,
g_checksum_get_string (root_checksum)); g_checksum_get_string (root_checksum),
root->metadata_sha256);
if (!import_gvariant_object (self, HACKTREE_SERIALIZED_COMMIT_VARIANT, if (!import_gvariant_object (self, HACKTREE_SERIALIZED_COMMIT_VARIANT,
commit, &ret_commit, error)) commit, &ret_commit, error))
goto out; goto out;
@ -1254,6 +1269,37 @@ commit_parsed_tree (HacktreeRepo *self,
return ret; return ret;
} }
static gboolean
import_root (HacktreeRepo *self,
const char *base,
ParsedDirectoryData **out_root,
GError **error)
{
gboolean ret = FALSE;
ParsedDirectoryData *ret_root = NULL;
GVariant *root_metadata = NULL;
GChecksum *root_meta_checksum = NULL;
if (!import_directory_meta (self, base, &root_metadata, &root_meta_checksum, error))
goto out;
ret_root = g_new0 (ParsedDirectoryData, 1);
ret_root->tree_data = parsed_tree_data_new ();
ret_root->meta_data = root_metadata;
root_metadata = NULL;
ret_root->metadata_sha256 = g_strdup (g_checksum_get_string (root_meta_checksum));
ret = TRUE;
*out_root = ret_root;
ret_root = NULL;
out:
if (root_metadata)
g_variant_unref (root_metadata);
if (root_meta_checksum)
g_checksum_free (root_meta_checksum);
parsed_directory_data_free (ret_root);
return ret;
}
gboolean gboolean
hacktree_repo_commit (HacktreeRepo *self, hacktree_repo_commit (HacktreeRepo *self,
@ -1268,31 +1314,42 @@ hacktree_repo_commit (HacktreeRepo *self,
{ {
HacktreeRepoPrivate *priv = GET_PRIVATE (self); HacktreeRepoPrivate *priv = GET_PRIVATE (self);
gboolean ret = FALSE; gboolean ret = FALSE;
ParsedTreeData *tree = NULL; ParsedDirectoryData *root = NULL;
GVariant *previous_commit = NULL; GVariant *previous_commit = NULL;
GChecksum *ret_commit_checksum = NULL; GChecksum *ret_commit_checksum = NULL;
char *orig_root_metadata_sha256 = NULL;
GVariant *root_metadata = NULL;
GChecksum *root_meta_checksum = NULL;
g_return_val_if_fail (error == NULL || *error == NULL, FALSE); g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
g_return_val_if_fail (priv->inited, FALSE); g_return_val_if_fail (priv->inited, FALSE);
if (priv->current_head) if (priv->current_head)
{ {
if (!load_commit_and_trees (self, priv->current_head, &previous_commit, &tree, error)) if (!load_commit_and_trees (self, priv->current_head, &previous_commit, &root, error))
goto out; goto out;
if (!import_directory_meta (self, base, &root_metadata, &root_meta_checksum, error))
goto out;
g_variant_unref (root->meta_data);
root->meta_data = root_metadata;
root_metadata = NULL;
root->metadata_sha256 = g_strdup (g_checksum_get_string (root_meta_checksum));
} }
else else
{ {
/* Initial commit */ /* Initial commit */
tree = parsed_tree_data_new (); if (!import_root (self, base, &root, error))
goto out;
} }
if (!remove_files_from_tree (self, base, removed_files, tree, error)) if (!remove_files_from_tree (self, base, removed_files, root->tree_data, error))
goto out; goto out;
if (!add_files_to_tree_and_import (self, base, modified_files, tree, error)) if (!add_files_to_tree_and_import (self, base, modified_files, root->tree_data, error))
goto out; goto out;
if (!commit_parsed_tree (self, subject, body, metadata, tree, &ret_commit_checksum, error)) if (!commit_parsed_tree (self, subject, body, metadata, root,
&ret_commit_checksum, error))
goto out; goto out;
ret = TRUE; ret = TRUE;
@ -1308,7 +1365,11 @@ hacktree_repo_commit (HacktreeRepo *self,
} }
if (previous_commit) if (previous_commit)
g_variant_unref (previous_commit); g_variant_unref (previous_commit);
parsed_tree_data_free (tree); parsed_directory_data_free (root);
if (root_metadata)
g_variant_unref (root_metadata);
if (root_meta_checksum)
g_checksum_free (root_meta_checksum);
return ret; return ret;
} }
@ -1325,7 +1386,7 @@ hacktree_repo_commit_from_filelist_fd (HacktreeRepo *self,
{ {
HacktreeRepoPrivate *priv = GET_PRIVATE (self); HacktreeRepoPrivate *priv = GET_PRIVATE (self);
gboolean ret = FALSE; gboolean ret = FALSE;
ParsedTreeData *tree = NULL; ParsedDirectoryData *root = NULL;
GVariant *previous_commit = NULL; GVariant *previous_commit = NULL;
GChecksum *ret_commit_checksum = NULL; GChecksum *ret_commit_checksum = NULL;
GUnixInputStream *in = NULL; GUnixInputStream *in = NULL;
@ -1333,12 +1394,15 @@ hacktree_repo_commit_from_filelist_fd (HacktreeRepo *self,
char *filename = NULL; char *filename = NULL;
gsize filename_len; gsize filename_len;
GError *temp_error = NULL; GError *temp_error = NULL;
GVariant *root_metadata = NULL;
GChecksum *root_meta_checksum = NULL;
g_return_val_if_fail (error == NULL || *error == NULL, FALSE); g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
g_return_val_if_fail (priv->inited, FALSE); g_return_val_if_fail (priv->inited, FALSE);
/* We're overwriting the tree */ /* We're overwriting the tree */
tree = parsed_tree_data_new (); if (!import_root (self, base, &root, error))
goto out;
in = (GUnixInputStream*)g_unix_input_stream_new (fd, FALSE); in = (GUnixInputStream*)g_unix_input_stream_new (fd, FALSE);
datain = g_data_input_stream_new ((GInputStream*)in); datain = g_data_input_stream_new ((GInputStream*)in);
@ -1354,7 +1418,7 @@ hacktree_repo_commit_from_filelist_fd (HacktreeRepo *self,
goto out; goto out;
} }
} }
if (!add_one_path_to_tree_and_import (self, base, filename, tree, error)) if (!add_one_path_to_tree_and_import (self, base, filename, root->tree_data, error))
goto out; goto out;
g_free (filename); g_free (filename);
filename = NULL; filename = NULL;
@ -1365,7 +1429,7 @@ hacktree_repo_commit_from_filelist_fd (HacktreeRepo *self,
goto out; goto out;
} }
if (!commit_parsed_tree (self, subject, body, metadata, if (!commit_parsed_tree (self, subject, body, metadata,
tree, &ret_commit_checksum, error)) root, &ret_commit_checksum, error))
goto out; goto out;
ret = TRUE; ret = TRUE;
@ -1379,10 +1443,14 @@ hacktree_repo_commit_from_filelist_fd (HacktreeRepo *self,
{ {
*out_commit = ret_commit_checksum; *out_commit = ret_commit_checksum;
} }
if (root_metadata)
g_variant_unref (root_metadata);
if (root_meta_checksum)
g_checksum_free (root_meta_checksum);
g_clear_object (&datain); g_clear_object (&datain);
g_clear_object (&in); g_clear_object (&in);
g_free (filename); g_free (filename);
parsed_tree_data_free (tree); parsed_directory_data_free (root);
return ret; return ret;
} }
@ -1569,7 +1637,6 @@ resolve_ref (HacktreeRepo *self,
return FALSE; return FALSE;
} }
static gboolean static gboolean
checkout_tree (HacktreeRepo *self, checkout_tree (HacktreeRepo *self,
ParsedTreeData *tree, ParsedTreeData *tree,
@ -1670,7 +1737,8 @@ hacktree_repo_checkout (HacktreeRepo *self,
gboolean ret = FALSE; gboolean ret = FALSE;
GVariant *commit = NULL; GVariant *commit = NULL;
char *resolved = NULL; char *resolved = NULL;
ParsedTreeData *tree = NULL; char *root_meta_sha = NULL;
ParsedDirectoryData *root = NULL;
if (g_file_test (destination, G_FILE_TEST_EXISTS)) if (g_file_test (destination, G_FILE_TEST_EXISTS))
{ {
@ -1683,17 +1751,10 @@ hacktree_repo_checkout (HacktreeRepo *self,
if (!resolve_ref (self, ref, &resolved, error)) if (!resolve_ref (self, ref, &resolved, error))
goto out; goto out;
/* FIXME - perms etc on root directory */ if (!load_commit_and_trees (self, resolved, &commit, &root, error))
if (mkdir (destination, (mode_t)0755) < 0)
{
ht_util_set_error_from_errno (error, errno);
goto out;
}
if (!load_commit_and_trees (self, resolved, &commit, &tree, error))
goto out; goto out;
if (!checkout_tree (self, tree, destination, error)) if (!checkout_one_directory (self, destination, NULL, root, error))
goto out; goto out;
ret = TRUE; ret = TRUE;
@ -1701,6 +1762,7 @@ hacktree_repo_checkout (HacktreeRepo *self,
g_free (resolved); g_free (resolved);
if (commit) if (commit)
g_variant_unref (commit); g_variant_unref (commit);
parsed_tree_data_free (tree); parsed_directory_data_free (root);
g_free (root_meta_sha);
return ret; return ret;
} }