core: Implement diff command
This commit is contained in:
Colin Walters committed
1 parent
073aa5973c
commit
9fb390664a
5 files changed
+459
-21
No files matched your search
+354
-4
@@ -1846,9 +1846,350 @@ ostree_repo_checkout (OstreeRepo *self,
|
||||
return ret;
|
||||
}
|
||||
|
||||
static gboolean
|
||||
get_file_checksum (GFile *f,
|
||||
char **out_checksum,
|
||||
GCancellable *cancellable,
|
||||
GError **error)
|
||||
{
|
||||
gboolean ret = FALSE;
|
||||
GChecksum *tmp_checksum = NULL;
|
||||
char *ret_checksum = NULL;
|
||||
struct stat stbuf;
|
||||
|
||||
if (OSTREE_IS_REPO_FILE (f))
|
||||
{
|
||||
ret_checksum = g_strdup (_ostree_repo_file_nontree_get_checksum ((OstreeRepoFile*)f));
|
||||
}
|
||||
else
|
||||
{
|
||||
if (!ostree_stat_and_checksum_file (-1, ot_gfile_get_path_cached (f),
|
||||
OSTREE_OBJECT_TYPE_FILE,
|
||||
&tmp_checksum, &stbuf, error))
|
||||
goto out;
|
||||
ret_checksum = g_strdup (g_checksum_get_string (tmp_checksum));
|
||||
}
|
||||
|
||||
ret = TRUE;
|
||||
*out_checksum = ret_checksum;
|
||||
ret_checksum = NULL;
|
||||
out:
|
||||
g_free (ret_checksum);
|
||||
if (tmp_checksum)
|
||||
g_checksum_free (tmp_checksum);
|
||||
return ret;
|
||||
}
|
||||
|
||||
OstreeRepoDiffItem *
|
||||
ostree_repo_diff_item_ref (OstreeRepoDiffItem *diffitem)
|
||||
{
|
||||
g_atomic_int_inc (&diffitem->refcount);
|
||||
return diffitem;
|
||||
}
|
||||
|
||||
void
|
||||
ostree_repo_diff_item_unref (OstreeRepoDiffItem *diffitem)
|
||||
{
|
||||
if (!g_atomic_int_dec_and_test (&diffitem->refcount))
|
||||
return;
|
||||
|
||||
g_clear_object (&diffitem->src);
|
||||
g_clear_object (&diffitem->target);
|
||||
g_clear_object (&diffitem->src_info);
|
||||
g_clear_object (&diffitem->target_info);
|
||||
g_free (diffitem->src_checksum);
|
||||
g_free (diffitem->target_checksum);
|
||||
g_free (diffitem);
|
||||
}
|
||||
|
||||
static OstreeRepoDiffItem *
|
||||
diff_item_new (GFile *a,
|
||||
GFileInfo *a_info,
|
||||
GFile *b,
|
||||
GFileInfo *b_info,
|
||||
char *checksum_a,
|
||||
char *checksum_b)
|
||||
{
|
||||
OstreeRepoDiffItem *ret = g_new0 (OstreeRepoDiffItem, 1);
|
||||
ret->refcount = 1;
|
||||
ret->src = a ? g_object_ref (a) : NULL;
|
||||
ret->src_info = a_info ? g_object_ref (a_info) : NULL;
|
||||
ret->target = b ? g_object_ref (b) : NULL;
|
||||
ret->target_info = b_info ? g_object_ref (b_info) : b_info;
|
||||
ret->src_checksum = g_strdup (checksum_a);
|
||||
ret->target_checksum = g_strdup (checksum_b);
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
||||
static gboolean
|
||||
diff_files (GFile *a,
|
||||
GFileInfo *a_info,
|
||||
GFile *b,
|
||||
GFileInfo *b_info,
|
||||
OstreeRepoDiffItem **out_item,
|
||||
GCancellable *cancellable,
|
||||
GError **error)
|
||||
{
|
||||
gboolean ret = FALSE;
|
||||
char *checksum_a = NULL;
|
||||
char *checksum_b = NULL;
|
||||
OstreeRepoDiffItem *ret_item = NULL;
|
||||
|
||||
if (!get_file_checksum (a, &checksum_a, cancellable, error))
|
||||
goto out;
|
||||
if (!get_file_checksum (b, &checksum_b, cancellable, error))
|
||||
goto out;
|
||||
|
||||
if (strcmp (checksum_a, checksum_b) != 0)
|
||||
{
|
||||
ret_item = diff_item_new (a, a_info, b, b_info,
|
||||
checksum_a, checksum_b);
|
||||
}
|
||||
|
||||
ret = TRUE;
|
||||
*out_item = ret_item;
|
||||
ret_item = NULL;
|
||||
out:
|
||||
if (ret_item)
|
||||
ostree_repo_diff_item_unref (ret_item);
|
||||
g_free (checksum_a);
|
||||
g_free (checksum_b);
|
||||
return ret;
|
||||
}
|
||||
|
||||
static gboolean
|
||||
diff_add_dir_recurse (GFile *d,
|
||||
GPtrArray *added,
|
||||
GCancellable *cancellable,
|
||||
GError **error)
|
||||
{
|
||||
gboolean ret = FALSE;
|
||||
GFileEnumerator *dir_enum = NULL;
|
||||
GError *temp_error = NULL;
|
||||
GFile *child = NULL;
|
||||
GFileInfo *child_info = NULL;
|
||||
|
||||
dir_enum = g_file_enumerate_children (d, OSTREE_GIO_FAST_QUERYINFO,
|
||||
G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS,
|
||||
cancellable,
|
||||
error);
|
||||
if (!dir_enum)
|
||||
goto out;
|
||||
|
||||
while ((child_info = g_file_enumerator_next_file (dir_enum, cancellable, &temp_error)) != NULL)
|
||||
{
|
||||
const char *name;
|
||||
|
||||
name = g_file_info_get_name (child_info);
|
||||
|
||||
g_clear_object (&child);
|
||||
child = g_file_get_child (d, name);
|
||||
|
||||
g_ptr_array_add (added, g_object_ref (child));
|
||||
|
||||
if (g_file_info_get_file_type (child_info) == G_FILE_TYPE_DIRECTORY)
|
||||
{
|
||||
if (!diff_add_dir_recurse (child, added, cancellable, error))
|
||||
goto out;
|
||||
}
|
||||
|
||||
g_clear_object (&child_info);
|
||||
}
|
||||
if (temp_error != NULL)
|
||||
{
|
||||
g_propagate_error (error, temp_error);
|
||||
goto out;
|
||||
}
|
||||
|
||||
ret = TRUE;
|
||||
out:
|
||||
g_clear_object (&child_info);
|
||||
g_clear_object (&child);
|
||||
g_clear_object (&dir_enum);
|
||||
return ret;
|
||||
}
|
||||
|
||||
static gboolean
|
||||
diff_dirs (GFile *a,
|
||||
GFile *b,
|
||||
GPtrArray *modified,
|
||||
GPtrArray *removed,
|
||||
GPtrArray *added,
|
||||
GCancellable *cancellable,
|
||||
GError **error)
|
||||
{
|
||||
gboolean ret = FALSE;
|
||||
GFileEnumerator *dir_enum = NULL;
|
||||
GError *temp_error = NULL;
|
||||
GFile *child_a = NULL;
|
||||
GFile *child_b = NULL;
|
||||
GFileInfo *child_a_info = NULL;
|
||||
GFileInfo *child_b_info = NULL;
|
||||
|
||||
dir_enum = g_file_enumerate_children (a, OSTREE_GIO_FAST_QUERYINFO,
|
||||
G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS,
|
||||
cancellable,
|
||||
error);
|
||||
if (!dir_enum)
|
||||
goto out;
|
||||
|
||||
while ((child_a_info = g_file_enumerator_next_file (dir_enum, cancellable, &temp_error)) != NULL)
|
||||
{
|
||||
const char *name;
|
||||
GFileType child_a_type;
|
||||
GFileType child_b_type;
|
||||
|
||||
name = g_file_info_get_name (child_a_info);
|
||||
|
||||
g_clear_object (&child_a);
|
||||
child_a = g_file_get_child (a, name);
|
||||
child_a_type = g_file_info_get_file_type (child_a_info);
|
||||
|
||||
g_clear_object (&child_b);
|
||||
child_b = g_file_get_child (b, name);
|
||||
|
||||
g_clear_object (&child_b_info);
|
||||
child_b_info = g_file_query_info (child_b, OSTREE_GIO_FAST_QUERYINFO,
|
||||
G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS,
|
||||
cancellable,
|
||||
&temp_error);
|
||||
if (!child_b_info)
|
||||
{
|
||||
if (g_error_matches (temp_error, G_IO_ERROR, G_IO_ERROR_NOT_FOUND))
|
||||
{
|
||||
g_clear_error (&temp_error);
|
||||
g_ptr_array_add (removed, g_object_ref (child_a));
|
||||
}
|
||||
else
|
||||
{
|
||||
g_propagate_error (error, temp_error);
|
||||
goto out;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
child_b_type = g_file_info_get_file_type (child_b_info);
|
||||
if (child_a_type != child_b_type)
|
||||
{
|
||||
g_ptr_array_add (modified, g_object_ref (child_a));
|
||||
}
|
||||
else if (child_a_type == G_FILE_TYPE_DIRECTORY)
|
||||
{
|
||||
if (!diff_dirs (child_a, child_b, modified,
|
||||
removed, added, cancellable, error))
|
||||
goto out;
|
||||
}
|
||||
else
|
||||
{
|
||||
OstreeRepoDiffItem *diff_item = NULL;
|
||||
|
||||
if (!diff_files (child_a, child_a_info, child_b, child_b_info, &diff_item, cancellable, error))
|
||||
goto out;
|
||||
|
||||
if (diff_item)
|
||||
g_ptr_array_add (modified, diff_item); /* Transfer ownership */
|
||||
}
|
||||
}
|
||||
|
||||
g_clear_object (&child_a_info);
|
||||
}
|
||||
if (temp_error != NULL)
|
||||
{
|
||||
g_propagate_error (error, temp_error);
|
||||
goto out;
|
||||
}
|
||||
|
||||
g_clear_object (&dir_enum);
|
||||
dir_enum = g_file_enumerate_children (b, OSTREE_GIO_FAST_QUERYINFO,
|
||||
G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS,
|
||||
cancellable,
|
||||
error);
|
||||
if (!dir_enum)
|
||||
goto out;
|
||||
|
||||
while ((child_b_info = g_file_enumerator_next_file (dir_enum, cancellable, &temp_error)) != NULL)
|
||||
{
|
||||
const char *name;
|
||||
|
||||
name = g_file_info_get_name (child_b_info);
|
||||
|
||||
g_clear_object (&child_a);
|
||||
child_a = g_file_get_child (a, name);
|
||||
|
||||
g_clear_object (&child_b);
|
||||
child_b = g_file_get_child (b, name);
|
||||
|
||||
g_clear_object (&child_a_info);
|
||||
child_a_info = g_file_query_info (child_a, OSTREE_GIO_FAST_QUERYINFO,
|
||||
G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS,
|
||||
cancellable,
|
||||
&temp_error);
|
||||
if (!child_a_info)
|
||||
{
|
||||
if (g_error_matches (temp_error, G_IO_ERROR, G_IO_ERROR_NOT_FOUND))
|
||||
{
|
||||
g_clear_error (&temp_error);
|
||||
g_ptr_array_add (added, g_object_ref (child_b));
|
||||
if (g_file_info_get_file_type (child_b_info) == G_FILE_TYPE_DIRECTORY)
|
||||
{
|
||||
if (!diff_add_dir_recurse (child_b, added, cancellable, error))
|
||||
goto out;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
g_propagate_error (error, temp_error);
|
||||
goto out;
|
||||
}
|
||||
}
|
||||
}
|
||||
if (temp_error != NULL)
|
||||
{
|
||||
g_propagate_error (error, temp_error);
|
||||
goto out;
|
||||
}
|
||||
|
||||
ret = TRUE;
|
||||
out:
|
||||
g_clear_object (&dir_enum);
|
||||
g_clear_object (&child_a_info);
|
||||
g_clear_object (&child_b_info);
|
||||
g_clear_object (&child_a);
|
||||
g_clear_object (&child_b);
|
||||
return ret;
|
||||
}
|
||||
|
||||
gboolean
|
||||
ostree_repo_read_commit (OstreeRepo *self,
|
||||
const char *rev,
|
||||
GFile **out_root,
|
||||
GCancellable *cancellable,
|
||||
GError **error)
|
||||
{
|
||||
gboolean ret = FALSE;
|
||||
GFile *ret_root = NULL;
|
||||
char *resolved_rev = NULL;
|
||||
|
||||
if (!resolve_rev (self, rev, FALSE, &resolved_rev, error))
|
||||
goto out;
|
||||
|
||||
ret_root = _ostree_repo_file_new_root (self, resolved_rev);
|
||||
if (!_ostree_repo_file_ensure_resolved ((OstreeRepoFile*)ret_root, error))
|
||||
goto out;
|
||||
|
||||
ret = TRUE;
|
||||
*out_root = ret_root;
|
||||
ret_root = NULL;
|
||||
out:
|
||||
g_free (resolved_rev);
|
||||
g_clear_object (&ret_root);
|
||||
return ret;
|
||||
}
|
||||
|
||||
gboolean
|
||||
ostree_repo_diff (OstreeRepo *self,
|
||||
const char *ref,
|
||||
GFile *src,
|
||||
GFile *target,
|
||||
GPtrArray **out_modified,
|
||||
GPtrArray **out_removed,
|
||||
@@ -1861,11 +2202,20 @@ ostree_repo_diff (OstreeRepo *self,
|
||||
GPtrArray *ret_removed = NULL;
|
||||
GPtrArray *ret_added = NULL;
|
||||
|
||||
g_set_error (error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED,
|
||||
"Not implemented yet");
|
||||
goto out;
|
||||
ret_modified = g_ptr_array_new_with_free_func ((GDestroyNotify)ostree_repo_diff_item_unref);
|
||||
ret_removed = g_ptr_array_new_with_free_func ((GDestroyNotify)g_object_unref);
|
||||
ret_added = g_ptr_array_new_with_free_func ((GDestroyNotify)g_object_unref);
|
||||
|
||||
if (!diff_dirs (src, target, ret_modified, ret_removed, ret_added, cancellable, error))
|
||||
goto out;
|
||||
|
||||
ret = TRUE;
|
||||
*out_modified = ret_modified;
|
||||
ret_modified = NULL;
|
||||
*out_removed = ret_removed;
|
||||
ret_removed = NULL;
|
||||
*out_added = ret_added;
|
||||
ret_added = NULL;
|
||||
out:
|
||||
if (ret_modified)
|
||||
g_ptr_array_free (ret_modified, TRUE);
|
||||
|
||||
Reference in new issue
Block a user