tree-wide: Replace archive-z2 with archive

In almost all places. There are just a few exceptions; one tricky bit for
example is that the repo config must still have `mode=archive-z2`, since
`archive` used to mean something else. (We could very likely just get rid of
that check, but eh, later).

I also added a test that one can still do `ostree repo init --mode=archive-z2`.

Closes: #1125
Approved by: jlebon
This commit is contained in:
Colin Walters authored and Atomic Bot committed 2017-09-01 20:54:12 +00:00
1 parent f07432d4ce
commit 88b25dc65c
57 files changed
+85 -78

No files matched your search

+1 -1
View File
@@ -312,7 +312,7 @@ _ostree_file_header_new (GFileInfo *file_info,
* @file_info: a #GFileInfo
* @xattrs: (allow-none): Optional extended attribute array
*
* Returns: (transfer full): A new #GVariant containing file header for an archive-z2 repository
* Returns: (transfer full): A new #GVariant containing file header for an archive repository
*/
GVariant *
_ostree_zlib_file_header_new (GFileInfo *file_info,
+1 -1
View File
@@ -3631,7 +3631,7 @@ ostree_repo_pull_with_options (OstreeRepo *self,
}
/* We can't use static deltas if pulling into an archive-z2 repo. */
/* We can't use static deltas if pulling into an archive repo. */
if (self->mode == OSTREE_REPO_MODE_ARCHIVE_Z2)
{
if (pull_data->require_static_deltas)
@@ -608,7 +608,7 @@ dispatch_open_splice_and_close (OstreeRepo *repo,
}
else
{
/* Slower path, for symlinks and unpacking deltas into archive-z2 */
/* Slower path, for symlinks and unpacking deltas into archive */
g_autoptr(GFileInfo) finfo =
_ostree_mode_uidgid_to_gfileinfo (state->mode, state->uid, state->gid);
+1 -1
View File
@@ -780,7 +780,7 @@ ostree_builtin_commit (int argc, char **argv, GCancellable *cancellable, GError
if (!ostree_repo_commit_transaction (repo, &stats, cancellable, error))
goto out;
/* The default for this option is FALSE, even for archive-z2 repos,
/* The default for this option is FALSE, even for archive repos,
* because ostree supports multiple processes committing to the same
* repo (but different refs) concurrently, and in fact gnome-continuous
* actually does this. In that context it's best to update the summary
+1 -1
View File
@@ -37,7 +37,7 @@ static char *opt_collection_id = NULL;
*/
static GOptionEntry options[] = {
{ "mode", 0, 0, G_OPTION_ARG_STRING, &opt_mode, "Initialize repository in given mode (bare, archive-z2)", NULL },
{ "mode", 0, 0, G_OPTION_ARG_STRING, &opt_mode, "Initialize repository in given mode (bare, archive)", NULL },
#ifdef OSTREE_ENABLE_EXPERIMENTAL_API
{ "collection-id", 0, 0, G_OPTION_ARG_STRING, &opt_collection_id,
"Globally unique ID for this repository as an collection of refs for redistribution to other repositories", "COLLECTION-ID" },