diff --git a/rust-bindings/rust/Cargo.toml b/rust-bindings/rust/Cargo.toml index c008bf94..b6930ed3 100644 --- a/rust-bindings/rust/Cargo.toml +++ b/rust-bindings/rust/Cargo.toml @@ -90,3 +90,4 @@ v2020_4 = ["v2020_2", "ostree-sys/v2020_4"] v2020_7 = ["v2020_4", "ostree-sys/v2020_7"] v2020_8 = ["v2020_7", "ostree-sys/v2020_8"] v2021_1 = ["v2020_8", "ostree-sys/v2021_1"] +v2021_2 = ["v2020_1", "ostree-sys/v2021_2"] diff --git a/rust-bindings/rust/Makefile b/rust-bindings/rust/Makefile index f267aee7..621f2260 100644 --- a/rust-bindings/rust/Makefile +++ b/rust-bindings/rust/Makefile @@ -1,6 +1,6 @@ GIR_REPO := https://github.com/gtk-rs/gir.git GIR_VERSION := 2d1ffab19eb5f9a2f0d7a294dbf07517dab4d989 -OSTREE_REPO := https://github.com/fkrull/ostree.git +OSTREE_REPO := ../ostree OSTREE_VERSION := patch-v2021.1 RUSTDOC_STRIPPER_VERSION := 0.1.17 diff --git a/rust-bindings/rust/README.md b/rust-bindings/rust/README.md index 9f27ce74..f0165358 100644 --- a/rust-bindings/rust/README.md +++ b/rust-bindings/rust/README.md @@ -54,7 +54,11 @@ Cargo commands. ### Generated code Most code is generated based on the gir files using the -[gir](https://github.com/gtk-rs/gir) tool. These parts can be regenerated using +[gir](https://github.com/gtk-rs/gir) tool. + +You can update `OSTree-1.0.gir` by directly copying it from a local ostree build. + +Or, these parts can be regenerated using the included Makefile: ```ShellSession diff --git a/rust-bindings/rust/conf/ostree.toml b/rust-bindings/rust/conf/ostree.toml index 372d05cb..f677e673 100644 --- a/rust-bindings/rust/conf/ostree.toml +++ b/rust-bindings/rust/conf/ostree.toml @@ -19,6 +19,7 @@ generate = [ "OSTree.AsyncProgress", "OSTree.BootconfigParser", "OSTree.ChecksumFlags", + "OSTree.ContentWriter", "OSTree.CommitSizesEntry", "OSTree.Deployment", "OSTree.DeploymentUnlockedState", @@ -71,6 +72,7 @@ manual = [ "Gio.FileQueryInfoFlags", "Gio.FilterInputStream", "Gio.InputStream", + "Gio.OutputStream", "Gio.VolumeMonitor", "GLib.Bytes", "GLib.Checksum", diff --git a/rust-bindings/rust/gir-files/OSTree-1.0.gir b/rust-bindings/rust/gir-files/OSTree-1.0.gir index 06e4164c..25571d00 100644 --- a/rust-bindings/rust/gir-files/OSTree-1.0.gir +++ b/rust-bindings/rust/gir-files/OSTree-1.0.gir @@ -1542,38 +1542,38 @@ entry corresponds to an object in the associated commit. version="2020.1"> Create a new #OstreeCommitSizesEntry for representing an object in a + line="2441">Create a new #OstreeCommitSizesEntry for representing an object in a commit's "ostree.sizes" metadata. a new #OstreeCommitSizesEntry + line="2451">a new #OstreeCommitSizesEntry object checksum + line="2443">object checksum object type + line="2444">object type unpacked object size + line="2445">unpacked object size compressed object size + line="2446">compressed object size @@ -1583,19 +1583,19 @@ commit's "ostree.sizes" metadata. version="2020.1"> Create a copy of the given @entry. + line="2471">Create a copy of the given @entry. a new copy of @entry + line="2477">a new copy of @entry an #OstreeCommitSizesEntry + line="2473">an #OstreeCommitSizesEntry @@ -1606,7 +1606,7 @@ commit's "ostree.sizes" metadata. version="2020.1"> Free given @entry. + line="2491">Free given @entry. @@ -1615,12 +1615,60 @@ commit's "ostree.sizes" metadata. an #OstreeCommitSizesEntry + line="2493">an #OstreeCommitSizesEntry + + + + Complete the object write and return the checksum. + + + Checksum, or %NULL on error + + + + + Writer + + + + Cancellable + + + + + + + + + + + @@ -3761,7 +3809,7 @@ exhaustion attacks. version="2018.9"> GVariant type `s`. This key can be used in the repo metadata which is stored + line="1524">GVariant type `s`. This key can be used in the repo metadata which is stored in OSTREE_REPO_METADATA_REF as well as in the summary. The semantics of this are that the remote repository wants clients to update their remote config to add this collection ID (clients can't do P2P operations involving a @@ -3776,7 +3824,7 @@ Flatpak may implement it. This is a replacement for the similar metadata key implemented by flatpak, `xa.collection-id`, which is now deprecated as clients which supported it had bugs with their P2P implementations. - + version="2018.6"> The name of a ref which is used to store metadata for the entire repository, + line="1501">The name of a ref which is used to store metadata for the entire repository, such as its expected update time (`ostree.summary.expires`), name, or new GPG keys. Metadata is stored on contentless commits in the ref, and hence is signed with the commits. @@ -4408,7 +4456,7 @@ collection ID (ostree_repo_set_collection_id()). Users of OSTree may place arbitrary metadata in commits on this ref, but the keys must be namespaced by product or developer. For example, `exampleos.end-of-life`. The `ostree.` prefix is reserved. - + This represents the configuration for a single remote repository. Currently, remotes can only be passed around as (reference counted) opaque handles. In future, more API may be added to create and interrogate them. - + @@ -4705,7 +4753,7 @@ already extant repository. If you want to create one, use ostree_repo_create_at c:identifier="ostree_repo_pull_default_console_progress_changed"> Convenient "changed" callback for use with + line="4768">Convenient "changed" callback for use with ostree_async_progress_new_and_connect() when pulling from a remote repository. @@ -4717,7 +4765,7 @@ number of objects. Compatibility note: this function previously assumed that @user_data was a pointer to a #GSConsole instance. This is no longer the case, and @user_data is ignored. - + @@ -4725,7 +4773,7 @@ and @user_data is ignored. Async progress + line="4770">Async progress allow-none="1"> User data + line="4771">User data @@ -4747,7 +4795,7 @@ and @user_data is ignored. line="297">This hash table is a mapping from #GVariant which can be accessed via ostree_object_name_deserialize() to a #GVariant containing either a similar #GVariant or and array of them, listing the parents of the key. - + filename="ostree-repo-traverse.c" line="282">This hash table is a set of #GVariant which can be accessed via ostree_object_name_deserialize(). - + filename="ostree-repo-traverse.c" line="348">Gets all the commits that a certain object belongs to, as recorded by a parents table gotten from ostree_repo_traverse_commit_union_with_parents. - + throws="1"> Add a GPG signature to a summary file. - + line="5139">Add a GPG signature to a summary file. + @@ -4849,13 +4897,13 @@ transaction will do nothing and return successfully. Self + line="5141">Self NULL-terminated array of GPG keys. + line="5142">NULL-terminated array of GPG keys. @@ -4866,7 +4914,7 @@ transaction will do nothing and return successfully. allow-none="1"> GPG home directory, or %NULL + line="5143">GPG home directory, or %NULL allow-none="1"> A #GCancellable + line="5144">A #GCancellable @@ -4885,8 +4933,8 @@ transaction will do nothing and return successfully. throws="1"> Append a GPG signature to a commit. - + line="4918">Append a GPG signature to a commit. + @@ -4894,19 +4942,19 @@ transaction will do nothing and return successfully. Self + line="4920">Self SHA256 of given commit to sign + line="4921">SHA256 of given commit to sign Signature data + line="4922">Signature data allow-none="1"> A #GCancellable + line="4923">A #GCancellable @@ -4937,7 +4985,7 @@ use with GObject introspection. Note in addition that unlike ostree_repo_checkout_tree(), the default is not to use the repository-internal uncompressed objects cache. - + @@ -4995,7 +5043,7 @@ cache. line="1460">Call this after finishing a succession of checkout operations; it will delete any currently-unused uncompressed objects from the cache. - + @@ -5026,7 +5074,7 @@ cache. physical filesystem. @source may be any subdirectory of a given commit. The @mode and @overwrite_mode allow control over how the files are checked out. - + @@ -5259,10 +5307,10 @@ this function on a repository initialized via ostree_repo_open_at(). throws="1"> Remove the object of type @objtype with checksum @sha256 + line="4212">Remove the object of type @objtype with checksum @sha256 from the repository. An error of type %G_IO_ERROR_NOT_FOUND is thrown if the object does not exist. - + @@ -5270,19 +5318,19 @@ is thrown if the object does not exist. Repo + line="4214">Repo Object type + line="4215">Object type Checksum + line="4216">Checksum allow-none="1"> Cancellable + line="4217">Cancellable @@ -5332,7 +5380,7 @@ ostree_repo_open() not being called on them yet), %FALSE will be returned. filename="ostree-repo-libarchive.c" line="1254">Import an archive file @archive into the repository, and write its file structure to @mtree. - + @@ -5421,7 +5469,7 @@ this is not guaranteed). GPG verification of commits will be used unconditionally. This will use the thread-default #GMainContext, but will not iterate it. - + @@ -5507,7 +5555,7 @@ This will use the thread-default #GMainContext, but will not iterate it. filename="ostree-repo-pull.c" line="6207">Finish an asynchronous pull operation started with ostree_repo_find_remotes_async(). - + throws="1"> Verify consistency of the object; this performs checks only relevant to the + line="4328">Verify consistency of the object; this performs checks only relevant to the immediate object itself, such as checksumming. This API call will not itself traverse metadata objects for example. - + @@ -5550,19 +5598,19 @@ traverse metadata objects for example. Repo + line="4330">Repo Object type + line="4331">Object type Checksum + line="4332">Checksum allow-none="1"> Cancellable + line="4333">Cancellable @@ -5581,20 +5629,20 @@ traverse metadata objects for example. version="2019.2"> Get the bootloader configured. See the documentation for the + line="6298">Get the bootloader configured. See the documentation for the "sysroot.bootloader" config key. bootloader configuration for the sysroot + line="6305">bootloader configuration for the sysroot an #OstreeRepo + line="6300">an #OstreeRepo @@ -5604,19 +5652,19 @@ traverse metadata objects for example. version="2018.6"> Get the collection ID of this repository. See [collection IDs][collection-ids]. + line="6226">Get the collection ID of this repository. See [collection IDs][collection-ids]. collection ID for the repository + line="6232">collection ID for the repository an #OstreeRepo + line="6228">an #OstreeRepo @@ -5640,13 +5688,13 @@ traverse metadata objects for example. version="2018.9"> Get the set of default repo finders configured. See the documentation for + line="6279">Get the set of default repo finders configured. See the documentation for the "core.default-repo-finders" config key. + line="6286"> %NULL-terminated array of strings. @@ -5656,7 +5704,7 @@ the "core.default-repo-finders" config key. an #OstreeRepo + line="6281">an #OstreeRepo @@ -5964,16 +6012,16 @@ option name. If an error is returned, @out_value will be set to %NULL. throws="1"> Sign the given @data with the specified keys in @key_id. Similar to + line="5205">Sign the given @data with the specified keys in @key_id. Similar to ostree_repo_add_gpg_signature_summary() but can be used on any data. You can use ostree_repo_gpg_verify_data() to verify the signatures. - + @TRUE if @data has been signed successfully, + line="5222">@TRUE if @data has been signed successfully, @FALSE in case of error (@error will contain the reason). @@ -5981,25 +6029,25 @@ You can use ostree_repo_gpg_verify_data() to verify the signatures. Self + line="5207">Self Data as a #GBytes + line="5208">Data as a #GBytes Existing signatures to append to (or %NULL) + line="5209">Existing signatures to append to (or %NULL) NULL-terminated array of GPG keys. + line="5210">NULL-terminated array of GPG keys. @@ -6010,7 +6058,7 @@ You can use ostree_repo_gpg_verify_data() to verify the signatures. allow-none="1"> GPG home directory, or %NULL + line="5211">GPG home directory, or %NULL transfer-ownership="full"> in case of success will contain signature + line="5212">in case of success will contain signature allow-none="1"> A #GCancellable + line="5213">A #GCancellable @@ -6039,23 +6087,23 @@ You can use ostree_repo_gpg_verify_data() to verify the signatures. throws="1"> Verify @signatures for @data using GPG keys in the keyring for + line="5612">Verify @signatures for @data using GPG keys in the keyring for @remote_name, and return an #OstreeGpgVerifyResult. The @remote_name parameter can be %NULL. In that case it will do the verifications using GPG keys in the keyrings of all remotes. - + an #OstreeGpgVerifyResult, or %NULL on error + line="5629">an #OstreeGpgVerifyResult, or %NULL on error Repository + line="5614">Repository allow-none="1"> Name of remote + line="5615">Name of remote Data as a #GBytes + line="5616">Data as a #GBytes Signatures as a #GBytes + line="5617">Signatures as a #GBytes allow-none="1"> Path to directory GPG keyrings; overrides built-in default if given + line="5618">Path to directory GPG keyrings; overrides built-in default if given allow-none="1"> Path to additional keyring file (not a directory) + line="5619">Path to additional keyring file (not a directory) allow-none="1"> Cancellable + line="5620">Cancellable @@ -6113,32 +6161,32 @@ the verifications using GPG keys in the keyrings of all remotes. throws="1"> Set @out_have_object to %TRUE if @self contains the given object; + line="4170">Set @out_have_object to %TRUE if @self contains the given object; %FALSE otherwise. %FALSE if an unexpected error occurred, %TRUE otherwise + line="4182">%FALSE if an unexpected error occurred, %TRUE otherwise Repo + line="4172">Repo Object type + line="4173">Object type ASCII SHA256 checksum + line="4174">ASCII SHA256 checksum transfer-ownership="full"> %TRUE if repository contains object + line="4175">%TRUE if repository contains object allow-none="1"> Cancellable + line="4176">Cancellable @@ -6194,7 +6242,7 @@ This function does no I/O. filename="ostree-repo-libarchive.c" line="840">Import an archive file @archive into the repository, and write its file structure to @mtree. - + @@ -6253,13 +6301,13 @@ file structure to @mtree. throws="1"> Copy object named by @objtype and @checksum into @self from the + line="4355">Copy object named by @objtype and @checksum into @self from the source repository @source. If both repositories are of the same type and on the same filesystem, this will simply be a fast Unix hard link operation. Otherwise, a copy will be performed. - + @@ -6267,25 +6315,25 @@ Otherwise, a copy will be performed. Destination repo + line="4357">Destination repo Source repo + line="4358">Source repo Object type + line="4359">Object type checksum + line="4360">checksum allow-none="1"> Cancellable + line="4361">Cancellable @@ -6305,13 +6353,13 @@ Otherwise, a copy will be performed. throws="1"> Copy object named by @objtype and @checksum into @self from the + line="4384">Copy object named by @objtype and @checksum into @self from the source repository @source. If @trusted is %TRUE and both repositories are of the same type and on the same filesystem, this will simply be a fast Unix hard link operation. Otherwise, a copy will be performed. - + @@ -6319,31 +6367,31 @@ Otherwise, a copy will be performed. Destination repo + line="4386">Destination repo Source repo + line="4387">Source repo Object type + line="4388">Object type checksum + line="4389">checksum If %TRUE, assume the source repo is valid and trusted + line="4390">If %TRUE, assume the source repo is valid and trusted allow-none="1"> Cancellable + line="4391">Cancellable @@ -6417,7 +6465,7 @@ If you want to exclude refs from `refs/remotes`, use %OSTREE_REPO_LIST_REFS_EXT_EXCLUDE_REMOTES in @flags. Similarly use %OSTREE_REPO_LIST_REFS_EXT_EXCLUDE_MIRRORS to exclude refs from `refs/mirrors`. - + This function synchronously enumerates all commit objects starting + line="4578">This function synchronously enumerates all commit objects starting with @start, returning data in @out_commits. - + %TRUE on success, %FALSE on error, and @error will be set + line="4590">%TRUE on success, %FALSE on error, and @error will be set Repo + line="4580">Repo List commits starting with this checksum + line="4581">List commits starting with this checksum transfer-ownership="container"> + line="4582"> Map of serialized commit name to variant data @@ -6517,7 +6565,7 @@ Map of serialized commit name to variant data allow-none="1"> Cancellable + line="4584">Cancellable @@ -6527,28 +6575,28 @@ Map of serialized commit name to variant data throws="1"> This function synchronously enumerates all objects in the + line="4524">This function synchronously enumerates all objects in the repository, returning data in @out_objects. @out_objects maps from keys returned by ostree_object_name_serialize() to #GVariant values of type %OSTREE_REPO_LIST_OBJECTS_VARIANT_TYPE. - + %TRUE on success, %FALSE on error, and @error will be set + line="4538">%TRUE on success, %FALSE on error, and @error will be set Repo + line="4526">Repo Flags controlling enumeration + line="4527">Flags controlling enumeration @@ -6558,7 +6606,7 @@ to #GVariant values of type %OSTREE_REPO_LIST_OBJECTS_VARIANT_TYPE. transfer-ownership="container"> + line="4528"> Map of serialized object name to variant data @@ -6571,7 +6619,7 @@ Map of serialized object name to variant data allow-none="1"> Cancellable + line="4530">Cancellable @@ -6586,7 +6634,7 @@ refspecs which have @refspec_prefix as a prefix. @out_all_refs will be returned as a mapping from refspecs (including the remote name) to checksums. If @refspec_prefix is non-%NULL, it will be removed as a prefix from the hash table keys. - + @@ -6643,7 +6691,7 @@ refspecs which have @refspec_prefix as a prefix. @out_all_refs will be returned as a mapping from refspecs (including the remote name) to checksums. Differently from ostree_repo_list_refs(), the @refspec_prefix will not be removed from the refspecs in the hash table. - + @@ -6702,7 +6750,7 @@ remote name) to checksums. Differently from ostree_repo_list_refs(), the filename="ostree-repo-static-delta-core.c" line="171">This function synchronously enumerates all static delta indexes in the repository, returning its result in @out_indexes. - + @@ -6742,7 +6790,7 @@ repository, returning its result in @out_indexes. filename="ostree-repo-static-delta-core.c" line="80">This function synchronously enumerates all static deltas in the repository, returning its result in @out_deltas. - + @@ -6780,11 +6828,11 @@ repository, returning its result in @out_deltas. throws="1"> A version of ostree_repo_load_variant() specialized to commits, + line="4500">A version of ostree_repo_load_variant() specialized to commits, capable of returning extended state information. Currently the only extended state is %OSTREE_REPO_COMMIT_STATE_PARTIAL, which means that only a sub-path of the commit is available. - + @@ -6792,13 +6840,13 @@ means that only a sub-path of the commit is available. Repo + line="4502">Repo Commit checksum + line="4503">Commit checksum allow-none="1"> Commit + line="4504">Commit allow-none="1"> Commit state + line="4505">Commit state @@ -6828,9 +6876,9 @@ means that only a sub-path of the commit is available. Load content object, decomposing it into three parts: the actual + line="4009">Load content object, decomposing it into three parts: the actual content (for regular files), the metadata, and extended attributes. - + @@ -6838,13 +6886,13 @@ content (for regular files), the metadata, and extended attributes. Repo + line="4011">Repo ASCII SHA256 checksum + line="4012">ASCII SHA256 checksum allow-none="1"> File content + line="4013">File content allow-none="1"> File information + line="4014">File information allow-none="1"> Extended attributes + line="4015">Extended attributes allow-none="1"> Cancellable + line="4016">Cancellable @@ -6899,9 +6947,9 @@ content (for regular files), the metadata, and extended attributes. throws="1"> Load object as a stream; useful when copying objects between + line="4070">Load object as a stream; useful when copying objects between repositories. - + @@ -6909,19 +6957,19 @@ repositories. Repo + line="4072">Repo Object type + line="4073">Object type ASCII SHA256 checksum + line="4074">ASCII SHA256 checksum transfer-ownership="full"> Stream for object + line="4075">Stream for object transfer-ownership="full"> Length of @out_input + line="4076">Length of @out_input allow-none="1"> Cancellable + line="4077">Cancellable @@ -6958,9 +7006,9 @@ repositories. throws="1"> Load the metadata object @sha256 of type @objtype, storing the + line="4478">Load the metadata object @sha256 of type @objtype, storing the result in @out_variant. - + @@ -6968,19 +7016,19 @@ result in @out_variant. Repo + line="4480">Repo Expected object type + line="4481">Expected object type Checksum string + line="4482">Checksum string transfer-ownership="full"> Metadata object + line="4483">Metadata object @@ -6999,10 +7047,11 @@ result in @out_variant. throws="1"> Attempt to load the metadata object @sha256 of type @objtype if it + line="4454">Attempt to load the metadata object @sha256 of type @objtype if it exists, storing the result in @out_variant. If it doesn't exist, -%NULL is returned. - +@out_variant will be set to %NULL and the function will still +return TRUE. + @@ -7010,28 +7059,29 @@ exists, storing the result in @out_variant. If it doesn't exist, Repo + line="4456">Repo Object type + line="4457">Object type ASCII checksum + line="4458">ASCII checksum + transfer-ownership="full" + nullable="1"> Metadata + line="4459">Metadata @@ -7210,7 +7260,7 @@ statistics on objects that would be deleted, without actually deleting them. Locking: exclusive - + @@ -7290,7 +7340,7 @@ The %OSTREE_REPO_PRUNE_FLAGS_NO_PRUNE flag may be specified to just determine statistics on objects that would be deleted, without actually deleting them. Locking: exclusive - + @@ -7355,7 +7405,7 @@ targeting that commit; otherwise any static delta of non existing commits are deleted. Locking: exclusive - + @@ -7390,7 +7440,7 @@ non existing commit Connect to the remote repository, fetching the specified set of + line="4656">Connect to the remote repository, fetching the specified set of refs @refs_to_fetch. For each ref that is changed, download the commit, all metadata, and all content objects, storing them safely on disk in @self. @@ -7406,7 +7456,7 @@ Warning: This API will iterate the thread default main context, which is a bug, but kept for compatibility reasons. If you want to avoid this, use g_main_context_push_thread_default() to push a new one around this call. - + @@ -7414,13 +7464,13 @@ one around this call. Repo + line="4658">Repo Name of remote + line="4659">Name of remote allow-none="1"> Optional list of refs; if %NULL, fetch all configured refs + line="4660">Optional list of refs; if %NULL, fetch all configured refs @@ -7437,7 +7487,7 @@ one around this call. Options controlling fetch behavior + line="4661">Options controlling fetch behavior allow-none="1"> Progress + line="4662">Progress allow-none="1"> Cancellable + line="4663">Cancellable @@ -7507,7 +7557,7 @@ The following @options are currently defined: not being pulled will be ignored and any ref without a keyring remote will be verified with the keyring of the remote being pulled from. Since: 2019.2 - + @@ -7585,7 +7635,7 @@ The following @options are currently defined: filename="ostree-repo-pull.c" line="6508">Finish an asynchronous pull operation started with ostree_repo_pull_from_remotes_async(). - + throws="1"> This is similar to ostree_repo_pull(), but only fetches a single + line="4695">This is similar to ostree_repo_pull(), but only fetches a single subpath. - + @@ -7622,19 +7672,19 @@ subpath. Repo + line="4697">Repo Name of remote + line="4698">Name of remote Subdirectory path + line="4699">Subdirectory path allow-none="1"> Optional list of refs; if %NULL, fetch all configured refs + line="4700">Optional list of refs; if %NULL, fetch all configured refs @@ -7651,7 +7701,7 @@ subpath. Options controlling fetch behavior + line="4701">Options controlling fetch behavior allow-none="1"> Progress + line="4702">Progress allow-none="1"> Cancellable + line="4703">Cancellable @@ -7730,7 +7780,7 @@ The following are currently defined: is specified, `summary-bytes` must also be specified. Since: 2020.5 * `disable-verify-bindings` (`b`): Disable verification of commit bindings. Since: 2020.9 - + @@ -7778,9 +7828,9 @@ The following are currently defined: throws="1"> Return the size in bytes of object with checksum @sha256, after any + line="4418">Return the size in bytes of object with checksum @sha256, after any compression has been applied. - + @@ -7788,19 +7838,19 @@ compression has been applied. Repo + line="4420">Repo Object type + line="4421">Object type Checksum + line="4422">Checksum transfer-ownership="full"> Size in bytes object occupies physically + line="4423">Size in bytes object occupies physically allow-none="1"> Cancellable + line="4424">Cancellable @@ -7828,8 +7878,8 @@ compression has been applied. throws="1"> Load the content for @rev into @out_root. - + line="4621">Load the content for @rev into @out_root. + @@ -7837,13 +7887,13 @@ compression has been applied. Repo + line="4623">Repo Ref or ASCII checksum + line="4624">Ref or ASCII checksum transfer-ownership="full"> An #OstreeRepoFile corresponding to the root + line="4625">An #OstreeRepoFile corresponding to the root transfer-ownership="full"> The resolved commit checksum + line="4626">The resolved commit checksum allow-none="1"> Cancellable + line="4627">Cancellable @@ -7880,10 +7930,10 @@ compression has been applied. throws="1"> OSTree commits can have arbitrary metadata associated; this + line="3095">OSTree commits can have arbitrary metadata associated; this function retrieves them. If none exists, @out_metadata will be set to %NULL. - + @@ -7891,13 +7941,13 @@ to %NULL. Repo + line="3097">Repo ASCII SHA256 commit checksum + line="3098">ASCII SHA256 commit checksum transfer-ownership="full"> Metadata associated with commit in with format "a{sv}", or %NULL if none exists + line="3099">Metadata associated with commit in with format "a{sv}", or %NULL if none exists allow-none="1"> Cancellable + line="3100">Cancellable @@ -7925,7 +7975,7 @@ to %NULL. throws="1"> An OSTree repository can contain a high level "summary" file that + line="5753">An OSTree repository can contain a high level "summary" file that describes the available branches and other metadata. If the timetable for making commits and updating the summary file is fairly @@ -7943,7 +7993,7 @@ and refs in %OSTREE_SUMMARY_COLLECTION_MAP are guaranteed to be in lexicographic order. Locking: exclusive - + @@ -7951,7 +8001,7 @@ Locking: exclusive Repo + line="5755">Repo allow-none="1"> A GVariant of type a{sv}, or %NULL + line="5756">A GVariant of type a{sv}, or %NULL allow-none="1"> Cancellable + line="5757">Cancellable @@ -8320,7 +8370,7 @@ The following are currently defined: line="2000">Return whether GPG verification is enabled for the remote named @name through @out_gpg_verify. It is an error if the provided remote does not exist. - + line="2034">Return whether GPG verification of the summary is enabled for the remote named @name through @out_gpg_verify_summary. It is an error if the provided remote does not exist. - + - + - + @@ -8600,7 +8650,7 @@ No filtering is performed. - + @@ -8658,7 +8708,7 @@ returned. If you want to check only local refs, not remote or mirrored ones, use the flag %OSTREE_REPO_RESOLVE_REV_EXT_LOCAL_ONLY. This is analogous to using ostree_repo_resolve_rev_ext() but for collection-refs. - + - + line="447">Look up the given refspec, returning the checksum it references in the parameter @out_rev. Will fall back on remote directory if cannot find the given refspec in local. - + @@ -8820,7 +8870,7 @@ local ref is specified but not found. The flag %OSTREE_REPO_RESOLVE_REV_EXT_LOCAL_ONLY is implied so using it has no effect. - + @@ -9009,21 +9059,21 @@ write permissions in the repo, where the cache is normally stored. throws="1"> Set or clear the collection ID of this repository. See [collection IDs][collection-ids]. + line="6243">Set or clear the collection ID of this repository. See [collection IDs][collection-ids]. The update will be made in memory, but must be written out to the repository configuration on disk using ostree_repo_write_config(). %TRUE on success, %FALSE otherwise + line="6253">%TRUE on success, %FALSE otherwise an #OstreeRepo + line="6245">an #OstreeRepo allow-none="1"> new collection ID, or %NULL to unset it + line="6246">new collection ID, or %NULL to unset it @@ -9174,8 +9224,8 @@ Multithreading: This function is MT safe. throws="1"> Add a GPG signature to a commit. - + line="5023">Add a GPG signature to a commit. + @@ -9183,19 +9233,19 @@ Multithreading: This function is MT safe. Self + line="5025">Self SHA256 of given commit to sign + line="5026">SHA256 of given commit to sign Use this GPG key id + line="5027">Use this GPG key id allow-none="1"> GPG home directory, or %NULL + line="5028">GPG home directory, or %NULL allow-none="1"> A #GCancellable + line="5029">A #GCancellable @@ -9223,9 +9273,9 @@ Multithreading: This function is MT safe. throws="1"> This function is deprecated, sign the summary file instead. + line="5112">This function is deprecated, sign the summary file instead. Add a GPG signature to a static delta. - + @@ -9233,31 +9283,31 @@ Add a GPG signature to a static delta. Self + line="5114">Self From commit + line="5115">From commit To commit + line="5116">To commit key id + line="5117">key id homedir + line="5118">homedir allow-none="1"> cancellable + line="5119">cancellable @@ -9280,7 +9330,7 @@ Add a GPG signature to a static delta. on disk, apply it, generating a new commit. The directory must be named with the form "FROM-TO", where both are checksums, and it must contain a file named "superblock", along with at least one part. - + @@ -9328,7 +9378,7 @@ signature verification will be mandatory before apply the static delta. The directory must be named with the form "FROM-TO", where both are checksums, and it must contain a file named "superblock", along with at least one part. - + @@ -9392,7 +9442,7 @@ are known: - filename: ay: Save delta superblock to this filename, and parts in the same directory. Default saves to repository. - sign-name: ay: Signature type to use. - sign-key-ids: as: Array of keys used to sign delta superblock. - + @@ -9468,7 +9518,7 @@ are reachable by an existing delta (if @opt_to_commit is %NULL). This is normally called automatically when the summary is updated in ostree_repo_regenerate_summary(). Locking: shared - + @@ -9510,7 +9560,7 @@ Locking: shared Verify static delta file signature. - + filename="ostree-repo-traverse.c" line="665">Create a new set @out_reachable containing all objects reachable from @commit_checksum, traversing @maxdepth parent commits. - + @@ -9756,7 +9806,7 @@ from @commit_checksum, traversing @maxdepth parent commits. filename="ostree-repo-traverse.c" line="639">Update the set @inout_reachable containing all objects reachable from @commit_checksum, traversing @maxdepth parent commits. - + @@ -9812,7 +9862,7 @@ from @commit_checksum, traversing @maxdepth parent commits. Additionally this constructs a mapping from each object to the parents of the object, which can be used to track which commits an object belongs to. - + @@ -9873,7 +9923,7 @@ belongs to. line="307">Add all commit objects directly reachable via a ref to @reachable. Locking: shared - + @@ -9915,26 +9965,26 @@ Locking: shared throws="1"> Check for a valid GPG signature on commit named by the ASCII + line="5501">Check for a valid GPG signature on commit named by the ASCII checksum @commit_checksum. - + %TRUE if there was a GPG signature from a trusted keyring, otherwise %FALSE + line="5513">%TRUE if there was a GPG signature from a trusted keyring, otherwise %FALSE Repository + line="5503">Repository ASCII SHA256 checksum + line="5504">ASCII SHA256 checksum allow-none="1"> Path to directory GPG keyrings; overrides built-in default if given + line="5505">Path to directory GPG keyrings; overrides built-in default if given allow-none="1"> Path to additional keyring file (not a directory) + line="5506">Path to additional keyring file (not a directory) allow-none="1"> Cancellable + line="5507">Cancellable @@ -9971,26 +10021,26 @@ checksum @commit_checksum. throws="1"> Read GPG signature(s) on the commit named by the ASCII checksum + line="5539">Read GPG signature(s) on the commit named by the ASCII checksum @commit_checksum and return detailed results. - + an #OstreeGpgVerifyResult, or %NULL on error + line="5551">an #OstreeGpgVerifyResult, or %NULL on error Repository + line="5541">Repository ASCII SHA256 checksum + line="5542">ASCII SHA256 checksum allow-none="1"> Path to directory GPG keyrings; overrides built-in default if given + line="5543">Path to directory GPG keyrings; overrides built-in default if given allow-none="1"> Path to additional keyring file (not a directory) + line="5544">Path to additional keyring file (not a directory) allow-none="1"> Cancellable + line="5545">Cancellable @@ -10028,33 +10078,33 @@ checksum @commit_checksum. throws="1"> Read GPG signature(s) on the commit named by the ASCII checksum + line="5575">Read GPG signature(s) on the commit named by the ASCII checksum @commit_checksum and return detailed results, based on the keyring configured for @remote. - + an #OstreeGpgVerifyResult, or %NULL on error + line="5587">an #OstreeGpgVerifyResult, or %NULL on error Repository + line="5577">Repository ASCII SHA256 checksum + line="5578">ASCII SHA256 checksum OSTree remote to use for configuration + line="5579">OSTree remote to use for configuration allow-none="1"> Cancellable + line="5580">Cancellable @@ -10073,38 +10123,38 @@ configured for @remote. throws="1"> Verify @signatures for @summary data using GPG keys in the keyring for + line="5662">Verify @signatures for @summary data using GPG keys in the keyring for @remote_name, and return an #OstreeGpgVerifyResult. - + an #OstreeGpgVerifyResult, or %NULL on error + line="5674">an #OstreeGpgVerifyResult, or %NULL on error Repo + line="5664">Repo Name of remote + line="5665">Name of remote Summary data as a #GBytes + line="5666">Summary data as a #GBytes Summary signatures as a #GBytes + line="5667">Summary signatures as a #GBytes allow-none="1"> Cancellable + line="5668">Cancellable @@ -10125,7 +10175,7 @@ configured for @remote. filename="ostree-repo-libarchive.c" line="968">Import an archive file @archive into the repository, and write its file structure to @mtree. - + @@ -10182,7 +10232,7 @@ file structure to @mtree. filename="ostree-repo-libarchive.c" line="1003">Read an archive from @fd and import it into the repository, writing its file structure to @mtree. - + @@ -10237,9 +10287,9 @@ its file structure to @mtree. throws="1"> Write a commit metadata object, referencing @root_contents_checksum + line="3009">Write a commit metadata object, referencing @root_contents_checksum and @root_metadata_checksum. - + @@ -10247,7 +10297,7 @@ and @root_metadata_checksum. Repo + line="3011">Repo allow-none="1"> ASCII SHA256 checksum for parent, or %NULL for none + line="3012">ASCII SHA256 checksum for parent, or %NULL for none allow-none="1"> Subject + line="3013">Subject allow-none="1"> Body + line="3014">Body allow-none="1"> GVariant of type a{sv}, or %NULL for none + line="3015">GVariant of type a{sv}, or %NULL for none The tree to point the commit to + line="3016">The tree to point the commit to transfer-ownership="full"> Resulting ASCII SHA256 checksum for commit + line="3017">Resulting ASCII SHA256 checksum for commit allow-none="1"> Cancellable + line="3018">Cancellable @@ -10317,10 +10367,10 @@ and @root_metadata_checksum. throws="1"> Replace any existing metadata associated with commit referred to by + line="3143">Replace any existing metadata associated with commit referred to by @checksum with @metadata. If @metadata is %NULL, then existing data will be deleted. - + @@ -10328,13 +10378,13 @@ data will be deleted. Repo + line="3145">Repo ASCII SHA256 commit checksum + line="3146">ASCII SHA256 commit checksum allow-none="1"> Metadata to associate with commit in with format "a{sv}", or %NULL to delete + line="3147">Metadata to associate with commit in with format "a{sv}", or %NULL to delete allow-none="1"> Cancellable + line="3148">Cancellable @@ -10362,9 +10412,9 @@ data will be deleted. throws="1"> Write a commit metadata object, referencing @root_contents_checksum + line="3041">Write a commit metadata object, referencing @root_contents_checksum and @root_metadata_checksum. - + @@ -10372,7 +10422,7 @@ and @root_metadata_checksum. Repo + line="3043">Repo allow-none="1"> ASCII SHA256 checksum for parent, or %NULL for none + line="3044">ASCII SHA256 checksum for parent, or %NULL for none allow-none="1"> Subject + line="3045">Subject allow-none="1"> Body + line="3046">Body allow-none="1"> GVariant of type a{sv}, or %NULL for none + line="3047">GVariant of type a{sv}, or %NULL for none The tree to point the commit to + line="3048">The tree to point the commit to The time to use to stamp the commit + line="3049">The time to use to stamp the commit transfer-ownership="full"> Resulting ASCII SHA256 checksum for commit + line="3050">Resulting ASCII SHA256 checksum for commit allow-none="1"> Cancellable + line="3051">Cancellable @@ -10536,9 +10586,9 @@ be returned as @out_csum. c:identifier="ostree_repo_write_content_async"> Asynchronously store the content object @object. If provided, the + line="2932">Asynchronously store the content object @object. If provided, the checksum @expected_checksum will be verified. - + @@ -10546,7 +10596,7 @@ checksum @expected_checksum will be verified. Repo + line="2934">Repo allow-none="1"> If provided, validate content against this checksum + line="2935">If provided, validate content against this checksum Input + line="2936">Input Length of @object + line="2937">Length of @object allow-none="1"> Cancellable + line="2938">Cancellable closure="5"> Invoked when content is writed + line="2939">Invoked when content is writed allow-none="1"> User data for @callback + line="2940">User data for @callback @@ -10606,8 +10656,8 @@ checksum @expected_checksum will be verified. throws="1"> Completes an invocation of ostree_repo_write_content_async(). - + line="2973">Completes an invocation of ostree_repo_write_content_async(). + @@ -10615,13 +10665,13 @@ checksum @expected_checksum will be verified. a #OstreeRepo + line="2975">a #OstreeRepo a #GAsyncResult + line="2976">a #GAsyncResult transfer-ownership="full"> A binary SHA256 checksum of the content object + line="2977">A binary SHA256 checksum of the content object @@ -10645,7 +10695,7 @@ length @length. The given @checksum will be treated as trusted. This function should be used when importing file objects from local disk, for example. - + @@ -10690,10 +10740,10 @@ disk, for example. throws="1"> Store as objects all contents of the directory referred to by @dfd + line="4098">Store as objects all contents of the directory referred to by @dfd and @path all children into the repository @self, overlaying the resulting filesystem hierarchy into @mtree. - + @@ -10701,25 +10751,25 @@ resulting filesystem hierarchy into @mtree. Repo + line="4100">Repo Directory file descriptor + line="4101">Directory file descriptor Path + line="4102">Path Overlay directory contents into this tree + line="4103">Overlay directory contents into this tree allow-none="1"> Optional modifier + line="4104">Optional modifier @@ -10738,7 +10788,7 @@ resulting filesystem hierarchy into @mtree. allow-none="1"> Cancellable + line="4105">Cancellable @@ -10748,9 +10798,9 @@ resulting filesystem hierarchy into @mtree. throws="1"> Store objects for @dir and all children into the repository @self, + line="4057">Store objects for @dir and all children into the repository @self, overlaying the resulting filesystem hierarchy into @mtree. - + @@ -10758,19 +10808,19 @@ overlaying the resulting filesystem hierarchy into @mtree. Repo + line="4059">Repo Path to a directory + line="4060">Path to a directory Overlay directory contents into this tree + line="4061">Overlay directory contents into this tree allow-none="1"> Optional modifier + line="4062">Optional modifier @@ -10789,7 +10839,7 @@ overlaying the resulting filesystem hierarchy into @mtree. allow-none="1"> Cancellable + line="4063">Cancellable @@ -10972,7 +11022,7 @@ the checksum @expected_checksum will be verified. filename="ostree-repo-commit.c" line="2494">Store the metadata object @variant; the provided @checksum is trusted. - + @@ -11025,7 +11075,7 @@ trusted. filename="ostree-repo-commit.c" line="2531">Store the metadata object @variant; the provided @checksum is trusted. - + @@ -11070,10 +11120,10 @@ trusted. throws="1"> Write all metadata objects for @mtree to repo; the resulting + line="4148">Write all metadata objects for @mtree to repo; the resulting @out_file points to the %OSTREE_OBJECT_TYPE_DIR_TREE object that the @mtree represented. - + @@ -11081,13 +11131,13 @@ the @mtree represented. Repo + line="4150">Repo Mutable tree + line="4151">Mutable tree transfer-ownership="full"> An #OstreeRepoFile representing @mtree's root. + line="4152">An #OstreeRepoFile representing @mtree's root. allow-none="1"> Cancellable + line="4153">Cancellable + + + + + + Create an `OstreeContentWriter` that allows streaming output into +the repository. + + + A new writer, or %NULL on error + + + + + Repo, + + + + Expected checksum (SHA-256 hex string) + + + + user id + + + + group id + + + + Unix file mode + + + + Expected content length + + + + Extended attributes (GVariant type `(ayay)`) + + + + + + Synchronously create a file object from the provided content. This API +is intended for small files where it is reasonable to buffer the entire +content in memory. + +Unlike `ostree_repo_write_content()`, if @expected_checksum is provided, +this function will not check for the presence of the object beforehand. + + + Checksum (as a hex string) of the committed file + + + + + repo + + + + The expected checksum + + + + User id + + + + Group id + + + + File mode + + + + Extended attributes, GVariant of type (ayay) + + + + File contents + + + + + + + + + Cancellable + + + + + + Synchronously create a symlink object. + +Unlike `ostree_repo_write_content()`, if @expected_checksum is provided, +this function will not check for the presence of the object beforehand. + + + Checksum (as a hex string) of the committed file + + + + + repo + + + + The expected checksum + + + + User id + + + + Group id + + + + Extended attributes, GVariant of type (ayay) + + + + Target of the symbolic link + + + + Cancellable @@ -11184,12 +11455,12 @@ is called. An extensible options structure controlling checkout. Ensure that + line="970">An extensible options structure controlling checkout. Ensure that you have entirely zeroed the structure, then set just the desired options. This is used by ostree_repo_checkout_at() which supercedes previous separate enumeration usage in ostree_repo_checkout_tree() and ostree_repo_checkout_tree_at(). - + @@ -11261,7 +11532,7 @@ ostree_repo_checkout_tree() and ostree_repo_checkout_tree_at(). Note that cache does *not* have its refcount incremented - the lifetime of @cache must be equal to or greater than that of @opts. - + @@ -11288,11 +11559,11 @@ Note that cache does *not* have its refcount incremented - the lifetime of - + #OstreeRepoCheckoutFilterResult saying whether or not to checkout this file + line="961">#OstreeRepoCheckoutFilterResult saying whether or not to checkout this file @@ -11300,13 +11571,13 @@ Note that cache does *not* have its refcount incremented - the lifetime of Repo + line="956">Repo Path to file + line="957">Path to file File information + line="958">File information User data + line="959">User data @@ -11333,37 +11604,37 @@ Note that cache does *not* have its refcount incremented - the lifetime of - + Do checkout this object + line="944">Do checkout this object Ignore this object + line="945">Ignore this object - + No special options + line="909">No special options Ignore uid/gid of files + line="910">Ignore uid/gid of files - + No special options + line="919">No special options When layering checkouts, unlink() and replace existing files, but do not modify existing directories (unless whiteouts are enabled, then directories are replaced) + line="920">When layering checkouts, unlink() and replace existing files, but do not modify existing directories (unless whiteouts are enabled, then directories are replaced) Only add new files/directories + line="921">Only add new files/directories Like UNION_FILES, but error if files are not identical (requires hardlink checkouts) + line="922">Like UNION_FILES, but error if files are not identical (requires hardlink checkouts) - + #OstreeRepoCommitFilterResult saying whether or not to commit this file + line="669">#OstreeRepoCommitFilterResult saying whether or not to commit this file @@ -11461,19 +11732,19 @@ ostree_repo_checkout_tree(). Repo + line="664">Repo Path to file + line="665">Path to file File information + line="666">File information closure="3"> User data + line="667">User data - + Do commit this object + line="654">Do commit this object Ignore this object + line="655">Ignore this object - + @@ -11533,21 +11804,21 @@ ostree_repo_checkout_tree(). c:symbol-prefix="repo_commit_modifier"> A structure allowing control over commits. - + line="696">A structure allowing control over commits. + - + A new commit modifier. + line="4236">A new commit modifier. Control options for filter + line="4231">Control options for filter @@ -11560,7 +11831,7 @@ ostree_repo_checkout_tree(). destroy="3"> Function that can inspect individual files + line="4232">Function that can inspect individual files allow-none="1"> User data + line="4233">User data scope="async"> A #GDestroyNotify + line="4234">A #GDestroyNotify - + @@ -11599,7 +11870,7 @@ ostree_repo_checkout_tree(). version="2017.13"> See the documentation for + line="4387">See the documentation for `ostree_repo_devino_cache_new()`. This function can then be used for later calls to `ostree_repo_write_directory_to_mtree()` to optimize commits. @@ -11609,7 +11880,7 @@ Note if your process has multiple writers, you should use separate This function will add a reference to @cache without copying - you should avoid further mutation of the cache. - + @@ -11617,14 +11888,14 @@ should avoid further mutation of the cache. Modifier + line="4389">Modifier A hash table caching device,inode to checksums + line="4390">A hash table caching device,inode to checksums @@ -11633,7 +11904,7 @@ should avoid further mutation of the cache. c:identifier="ostree_repo_commit_modifier_set_sepolicy"> If @policy is non-%NULL, use it to look up labels to use for + line="4309">If @policy is non-%NULL, use it to look up labels to use for "security.selinux" extended attributes. Note that any policy specified this way operates in addition to any @@ -11641,7 +11912,7 @@ extended attributes provided via ostree_repo_commit_modifier_set_xattr_callback(). However if both specify a value for "security.selinux", then the one from the policy wins. - + @@ -11649,7 +11920,7 @@ policy wins. An #OstreeRepoCommitModifier + line="4311">An #OstreeRepoCommitModifier @@ -11659,7 +11930,7 @@ policy wins. allow-none="1"> Policy to use for labeling + line="4312">Policy to use for labeling @@ -11670,10 +11941,10 @@ policy wins. throws="1"> In many cases, one wants to create a "derived" commit from base commit. + line="4331">In many cases, one wants to create a "derived" commit from base commit. SELinux policy labels are part of that base commit. This API allows one to easily set up SELinux labeling from a base commit. - + @@ -11681,20 +11952,20 @@ one to easily set up SELinux labeling from a base commit. Commit modifier + line="4333">Commit modifier OSTree repo containing @rev + line="4334">OSTree repo containing @rev Find SELinux policy from this base commit + line="4335">Find SELinux policy from this base commit c:identifier="ostree_repo_commit_modifier_set_xattr_callback"> If set, this function should return extended attributes to use for + line="4286">If set, this function should return extended attributes to use for the given path. This is useful for things like ACLs and SELinux, where a build system can label the files as it's committing to the repository. - + @@ -11721,7 +11992,7 @@ repository. An #OstreeRepoCommitModifier + line="4288">An #OstreeRepoCommitModifier @@ -11732,14 +12003,14 @@ repository. destroy="1"> Function to be invoked, should return extended attributes for path + line="4289">Function to be invoked, should return extended attributes for path Destroy notification + line="4290">Destroy notification allow-none="1"> Data for @callback: + line="4291">Data for @callback: - + @@ -11768,60 +12039,60 @@ repository. - + No special flags + line="678">No special flags Do not process extended attributes + line="679">Do not process extended attributes Generate size information. + line="680">Generate size information. Canonicalize permissions for bare-user-only mode. + line="681">Canonicalize permissions for bare-user-only mode. Emit an error if configured SELinux policy does not provide a label + line="682">Emit an error if configured SELinux policy does not provide a label Delete added files/directories after commit; Since: 2017.13 + line="683">Delete added files/directories after commit; Since: 2017.13 If a devino cache hit is found, skip modifier filters (non-directories only); Since: 2017.14 + line="684">If a devino cache hit is found, skip modifier filters (non-directories only); Since: 2017.14 - + @@ -11879,7 +12150,7 @@ by ostree_repo_load_commit(). - + @@ -11887,7 +12158,7 @@ by ostree_repo_load_commit(). - + @@ -11903,7 +12174,7 @@ by ostree_repo_load_commit(). - + @@ -11921,7 +12192,7 @@ by ostree_repo_load_commit(). line="235">Return information on the current directory. This function may only be called if %OSTREE_REPO_COMMIT_ITER_RESULT_DIR was returned from ostree_repo_commit_traverse_iter_next(). - + @@ -11969,7 +12240,7 @@ from ostree_repo_commit_traverse_iter_next(). line="214">Return information on the current file. This function may only be called if %OSTREE_REPO_COMMIT_ITER_RESULT_FILE was returned from ostree_repo_commit_traverse_iter_next(). - + @@ -12007,7 +12278,7 @@ ostree_repo_commit_traverse_iter_next(). Initialize (in place) an iterator over the root of a commit object. - + @@ -12046,7 +12317,7 @@ ostree_repo_commit_traverse_iter_next(). Initialize (in place) an iterator over a directory tree. - + @@ -12096,7 +12367,7 @@ ostree_repo_commit_traverse_iter_get_file(). If %OSTREE_REPO_COMMIT_ITER_RESULT_ERROR is returned, it is a program error to call any further API on @iter except for ostree_repo_commit_traverse_iter_clear(). - + @@ -12122,7 +12393,7 @@ ostree_repo_commit_traverse_iter_clear(). - + @@ -12152,7 +12423,7 @@ directory. In order for OSTree to optimally detect just the new files, use this function and fill in the `devino_to_csum_cache` member of `OstreeRepoCheckoutAtOptions`, then call ostree_repo_commit_set_devino_cache(). - + - + @@ -12172,7 +12443,7 @@ ostree_repo_commit_set_devino_cache(). - + @@ -12188,10 +12459,10 @@ ostree_repo_commit_set_devino_cache(). introspectable="0"> An extensible options structure controlling archive creation. Ensure that + line="834">An extensible options structure controlling archive creation. Ensure that you have entirely zeroed the structure, then set just the desired options. This is used by ostree_repo_export_tree_to_archive(). - + @@ -13421,10 +13692,10 @@ to pull from, and hence needs to be ordered before the other. introspectable="0"> An extensible options structure controlling archive import. Ensure that + line="805">An extensible options structure controlling archive import. Ensure that you have entirely zeroed the structure, then set just the desired options. This is used by ostree_repo_import_archive_to_mtree(). - + @@ -13463,7 +13734,7 @@ options. This is used by ostree_repo_import_archive_to_mtree(). version="2017.11"> Possibly change a pathname while importing an archive. If %NULL is returned, + line="780">Possibly change a pathname while importing an archive. If %NULL is returned, then @src_path will be used unchanged. Otherwise, return a new pathname which will be freed via `g_free()`. @@ -13473,7 +13744,7 @@ types, first with outer directories, then their sub-files and directories. Note that enabling pathname translation will always override the setting for `use_ostree_convention`. - + @@ -13481,7 +13752,7 @@ Note that enabling pathname translation will always override the setting for Repo + line="782">Repo Stat buffer + line="783">Stat buffer Path in the archive + line="784">Path in the archive User data + line="785">User data - + List only loose (plain file) objects + line="1041">List only loose (plain file) objects List only packed (compacted into blobs) objects + line="1042">List only packed (compacted into blobs) objects List all objects + line="1043">List all objects Only list objects in this repo, not parents + line="1044">Only list objects in this repo, not parents - + No flags. + line="541">No flags. Only list aliases. Since: 2017.10 + line="542">Only list aliases. Since: 2017.10 Exclude remote refs. Since: 2017.11 + line="543">Exclude remote refs. Since: 2017.11 Exclude mirrored refs. Since: 2019.2 + line="544">Exclude mirrored refs. Since: 2019.2 @@ -13610,31 +13881,31 @@ possible modes. - + No special options for pruning + line="1243">No special options for pruning Don't actually delete objects + line="1244">Don't actually delete objects Do not traverse individual commit objects, only follow refs + line="1245">Do not traverse individual commit objects, only follow refs - + @@ -13661,46 +13932,46 @@ possible modes. - + No special options for pull + line="1302">No special options for pull Write out refs suitable for mirrors and fetch all refs if none requested + line="1303">Write out refs suitable for mirrors and fetch all refs if none requested Fetch only the commit metadata + line="1304">Fetch only the commit metadata Do verify checksums of local (filesystem-accessible) repositories (defaults on for HTTP) + line="1305">Do verify checksums of local (filesystem-accessible) repositories (defaults on for HTTP) Since 2017.7. Reject writes of content objects with modes outside of 0775. + line="1306">Since 2017.7. Reject writes of content objects with modes outside of 0775. Don't verify checksums of objects HTTP repositories (Since: 2017.12) + line="1307">Don't verify checksums of objects HTTP repositories (Since: 2017.12) @@ -13746,20 +14017,20 @@ possible modes. - + No flags. + line="507">No flags. Exclude remote and mirrored refs. Since: 2019.2 + line="508">Exclude remote and mirrored refs. Since: 2019.2 c:type="OstreeStaticDeltaGenerateOpt"> Parameters controlling optimization of static deltas. - + line="1087">Parameters controlling optimization of static deltas. + Optimize for speed of delta creation over space + line="1089">Optimize for speed of delta creation over space Optimize for delta size (may be very slow) + line="1090">Optimize for delta size (may be very slow) Flags controlling static delta index generation. - + line="1109">Flags controlling static delta index generation. + No special flags + line="1111">No special flags In many cases using libostree, a program may need to "break" + line="782">In many cases using libostree, a program may need to "break" hardlinks by performing a copy. For example, in order to logically append to a file. @@ -18106,19 +18377,19 @@ care of synchronization. Directory fd + line="784">Directory fd Path relative to @dfd + line="785">Path relative to @dfd Do not copy extended attributes + line="786">Do not copy extended attributes %TRUE if current libostree has at least the requested version, %FALSE otherwise + line="2711">%TRUE if current libostree has at least the requested version, %FALSE otherwise Major/year required + line="2708">Major/year required Release version required + line="2709">Release version required @@ -18161,7 +18432,7 @@ care of synchronization. Modified base64 encoding of @csum + line="1552">Modified base64 encoding of @csum The "modified" term refers to the fact that instead of '/', the '_' character is used. @@ -18171,7 +18442,7 @@ character is used. An binary checksum of length 32 + line="1550">An binary checksum of length 32 @@ -18183,7 +18454,7 @@ character is used. introspectable="0"> Overwrite the contents of @buf with modified base64 encoding of @csum. + line="1480">Overwrite the contents of @buf with modified base64 encoding of @csum. The "modified" term refers to the fact that instead of '/', the '_' character is used. @@ -18194,7 +18465,7 @@ character is used. An binary checksum of length 32 + line="1482">An binary checksum of length 32 @@ -18202,7 +18473,7 @@ character is used. Output location, must be at least 44 bytes in length + line="1483">Output location, must be at least 44 bytes in length @@ -18212,7 +18483,7 @@ character is used. introspectable="0"> Overwrite the contents of @buf with stringified version of @csum. + line="1361">Overwrite the contents of @buf with stringified version of @csum. @@ -18221,7 +18492,7 @@ character is used. An binary checksum of length 32 + line="1363">An binary checksum of length 32 @@ -18229,7 +18500,7 @@ character is used. Output location, must be at least 45 bytes in length + line="1364">Output location, must be at least 45 bytes in length @@ -18241,7 +18512,7 @@ character is used. Binary version of @checksum. + line="1454">Binary version of @checksum. @@ -18250,7 +18521,7 @@ character is used. An ASCII checksum + line="1452">An ASCII checksum @@ -18261,7 +18532,7 @@ character is used. Binary checksum data in @bytes; do not free. If @bytes does not have the correct length, return %NULL. + line="1571">Binary checksum data in @bytes; do not free. If @bytes does not have the correct length, return %NULL. @@ -18270,7 +18541,7 @@ character is used. #GVariant of type ay + line="1569">#GVariant of type ay @@ -18280,12 +18551,12 @@ character is used. throws="1"> Like ostree_checksum_bytes_peek(), but also throws @error. + line="1584">Like ostree_checksum_bytes_peek(), but also throws @error. Binary checksum data + line="1591">Binary checksum data @@ -18294,7 +18565,7 @@ character is used. #GVariant of type ay + line="1586">#GVariant of type ay @@ -18304,7 +18575,7 @@ character is used. throws="1"> Compute the OSTree checksum for a given file. + line="893">Compute the OSTree checksum for a given file. @@ -18313,13 +18584,13 @@ character is used. File path + line="895">File path Object type + line="896">Object type transfer-ownership="full"> Return location for binary checksum + line="897">Return location for binary checksum @@ -18339,7 +18610,7 @@ character is used. allow-none="1"> Cancellable + line="898">Cancellable @@ -18348,7 +18619,7 @@ character is used. c:identifier="ostree_checksum_file_async"> Asynchronously compute the OSTree checksum for a given file; + line="1052">Asynchronously compute the OSTree checksum for a given file; complete with ostree_checksum_file_async_finish(). @@ -18358,19 +18629,19 @@ complete with ostree_checksum_file_async_finish(). File path + line="1054">File path Object type + line="1055">Object type Priority for operation, see %G_IO_PRIORITY_DEFAULT + line="1056">Priority for operation, see %G_IO_PRIORITY_DEFAULT allow-none="1"> Cancellable + line="1057">Cancellable closure="5"> Invoked when operation is complete + line="1058">Invoked when operation is complete allow-none="1"> Data for @callback + line="1059">Data for @callback @@ -18409,7 +18680,7 @@ complete with ostree_checksum_file_async_finish(). throws="1"> Finish computing the OSTree checksum for a given file; see + line="1086">Finish computing the OSTree checksum for a given file; see ostree_checksum_file_async(). @@ -18419,13 +18690,13 @@ ostree_checksum_file_async(). File path + line="1088">File path Async result + line="1089">Async result transfer-ownership="full"> Return location for binary checksum + line="1090">Return location for binary checksum @@ -18447,7 +18718,7 @@ ostree_checksum_file_async(). throws="1"> Compute the OSTree checksum for a given file. This is an fd-relative version + line="945">Compute the OSTree checksum for a given file. This is an fd-relative version of ostree_checksum_file() which also takes flags and fills in a caller allocated buffer. @@ -18458,13 +18729,13 @@ allocated buffer. Directory file descriptor + line="947">Directory file descriptor Subpath + line="948">Subpath @stbuf (allow-none): Optional stat buffer @@ -18477,13 +18748,13 @@ allocated buffer. Object type + line="950">Object type Flags + line="951">Flags @out_checksum (out) (transfer full): Return location for hex checksum @@ -18496,7 +18767,7 @@ allocated buffer. allow-none="1"> Cancellable + line="953">Cancellable @@ -18506,7 +18777,7 @@ allocated buffer. throws="1"> Compute the OSTree checksum for a given input. + line="839">Compute the OSTree checksum for a given input. @@ -18515,7 +18786,7 @@ allocated buffer. File information + line="841">File information allow-none="1"> Optional extended attributes + line="842">Optional extended attributes allow-none="1"> File content, should be %NULL for symbolic links + line="843">File content, should be %NULL for symbolic links Object type + line="844">Object type transfer-ownership="full"> Return location for binary checksum + line="845">Return location for binary checksum @@ -18559,7 +18830,7 @@ allocated buffer. allow-none="1"> Cancellable + line="846">Cancellable @@ -18570,14 +18841,14 @@ allocated buffer. String form of @csum + line="1526">String form of @csum An binary checksum of length 32 + line="1524">An binary checksum of length 32 @@ -18590,14 +18861,14 @@ allocated buffer. String form of @csum_bytes + line="1540">String form of @csum_bytes #GVariant of type ay + line="1538">#GVariant of type ay @@ -18607,7 +18878,7 @@ allocated buffer. introspectable="0"> Overwrite the contents of @buf with stringified version of @csum. + line="1466">Overwrite the contents of @buf with stringified version of @csum. @@ -18616,7 +18887,7 @@ allocated buffer. An binary checksum of length 32 + line="1468">An binary checksum of length 32 @@ -18624,7 +18895,7 @@ allocated buffer. Output location, must be at least OSTREE_SHA256_STRING_LEN+1 bytes in length + line="1469">Output location, must be at least OSTREE_SHA256_STRING_LEN+1 bytes in length @@ -18633,7 +18904,7 @@ allocated buffer. c:identifier="ostree_checksum_inplace_to_bytes"> Convert @checksum from a string to binary in-place, without + line="1390">Convert @checksum from a string to binary in-place, without allocating memory. Use this function in hot code paths. @@ -18643,13 +18914,13 @@ allocating memory. Use this function in hot code paths. a SHA256 string + line="1392">a SHA256 string Output buffer with at least 32 bytes of space + line="1393">Output buffer with at least 32 bytes of space @@ -18659,7 +18930,7 @@ allocating memory. Use this function in hot code paths. Binary checksum from @checksum of length 32; free with g_free(). + line="1426">Binary checksum from @checksum of length 32; free with g_free(). @@ -18668,7 +18939,7 @@ allocating memory. Use this function in hot code paths. An ASCII checksum + line="1424">An ASCII checksum @@ -18679,14 +18950,14 @@ allocating memory. Use this function in hot code paths. New #GVariant of type ay with length 32 + line="1440">New #GVariant of type ay with length 32 An ASCII checksum + line="1438">An ASCII checksum @@ -18701,7 +18972,7 @@ allocating memory. Use this function in hot code paths. c:identifier="ostree_cmp_checksum_bytes"> Compare two binary checksums, using memcmp(). + line="1312">Compare two binary checksums, using memcmp(). @@ -18710,13 +18981,13 @@ allocating memory. Use this function in hot code paths. A binary checksum + line="1314">A binary checksum A binary checksum + line="1315">A binary checksum @@ -18832,7 +19103,7 @@ must be %NULL-terminated; it may be empty, but must not be %NULL. version="2018.2"> There are use cases where one wants a checksum just of the content of a + line="2392">There are use cases where one wants a checksum just of the content of a commit. OSTree commits by default capture the current timestamp, and may have additional metadata, which means that re-committing identical content often results in a new checksum. @@ -18847,14 +19118,14 @@ root "dirmeta" checksum (both in binary form, not hexadecimal). A SHA-256 hex string, or %NULL if @commit_variant is not well-formed + line="2408">A SHA-256 hex string, or %NULL if @commit_variant is not well-formed A commit object + line="2394">A commit object @@ -18865,7 +19136,7 @@ root "dirmeta" checksum (both in binary form, not hexadecimal). throws="1"> Reads a commit's "ostree.sizes" metadata and returns an array of + line="2566">Reads a commit's "ostree.sizes" metadata and returns an array of #OstreeCommitSizesEntry in @out_sizes_entries. Each element represents an object in the commit. If the commit does not contain the "ostree.sizes" metadata, a %G_IO_ERROR_NOT_FOUND error will be @@ -18878,7 +19149,7 @@ returned. variant of type %OSTREE_OBJECT_TYPE_COMMIT + line="2568">variant of type %OSTREE_OBJECT_TYPE_COMMIT allow-none="1"> + line="2569"> return location for an array of object size entries @@ -18902,7 +19173,7 @@ returned. Checksum of the parent commit of @commit_variant, or %NULL + line="2363">Checksum of the parent commit of @commit_variant, or %NULL if none @@ -18910,7 +19181,7 @@ if none Variant of type %OSTREE_OBJECT_TYPE_COMMIT + line="2361">Variant of type %OSTREE_OBJECT_TYPE_COMMIT @@ -18922,14 +19193,14 @@ if none timestamp in seconds since the Unix epoch, UTC + line="2380">timestamp in seconds since the Unix epoch, UTC Commit object + line="2378">Commit object @@ -18971,7 +19242,7 @@ if none throws="1"> A thin wrapper for ostree_content_stream_parse(); this function + line="707">A thin wrapper for ostree_content_stream_parse(); this function converts an object content stream back into components. @@ -18981,19 +19252,19 @@ converts an object content stream back into components. Whether or not the stream is zlib-compressed + line="709">Whether or not the stream is zlib-compressed Path to file containing content + line="710">Path to file containing content If %TRUE, assume the content has been validated + line="711">If %TRUE, assume the content has been validated transfer-ownership="full"> The raw file content stream + line="712">The raw file content stream transfer-ownership="full"> Normal metadata + line="713">Normal metadata transfer-ownership="full"> Extended attributes + line="714">Extended attributes allow-none="1"> Cancellable + line="715">Cancellable @@ -19039,7 +19310,7 @@ converts an object content stream back into components. throws="1"> A thin wrapper for ostree_content_stream_parse(); this function + line="656">A thin wrapper for ostree_content_stream_parse(); this function converts an object content stream back into components. @@ -19049,25 +19320,25 @@ converts an object content stream back into components. Whether or not the stream is zlib-compressed + line="658">Whether or not the stream is zlib-compressed Directory file descriptor + line="659">Directory file descriptor Subpath + line="660">Subpath If %TRUE, assume the content has been validated + line="661">If %TRUE, assume the content has been validated transfer-ownership="full"> The raw file content stream + line="662">The raw file content stream transfer-ownership="full"> Normal metadata + line="663">Normal metadata transfer-ownership="full"> Extended attributes + line="664">Extended attributes allow-none="1"> Cancellable + line="665">Cancellable @@ -19113,7 +19384,7 @@ converts an object content stream back into components. throws="1"> The reverse of ostree_raw_file_to_content_stream(); this function + line="557">The reverse of ostree_raw_file_to_content_stream(); this function converts an object content stream back into components. @@ -19123,25 +19394,25 @@ converts an object content stream back into components. Whether or not the stream is zlib-compressed + line="559">Whether or not the stream is zlib-compressed Object content stream + line="560">Object content stream Length of stream + line="561">Length of stream If %TRUE, assume the content has been validated + line="562">If %TRUE, assume the content has been validated transfer-ownership="full"> The raw file content stream + line="563">The raw file content stream transfer-ownership="full"> Normal metadata + line="564">Normal metadata transfer-ownership="full"> Extended attributes + line="565">Extended attributes allow-none="1"> Cancellable + line="566">Cancellable @@ -19188,14 +19459,14 @@ converts an object content stream back into components. A new #GVariant containing %OSTREE_OBJECT_TYPE_DIR_META + line="1138">A new #GVariant containing %OSTREE_OBJECT_TYPE_DIR_META a #GFileInfo containing directory information + line="1135">a #GFileInfo containing directory information allow-none="1"> Optional extended attributes + line="1136">Optional extended attributes @@ -19404,7 +19675,7 @@ sets of #OstreeDiffItem in @modified, @removed, and @added. Use this function with #GHashTable and ostree_object_name_serialize(). + line="1293">Use this function with #GHashTable and ostree_object_name_serialize(). @@ -19416,7 +19687,7 @@ sets of #OstreeDiffItem in @modified, @removed, and @added. allow-none="1"> A #GVariant containing a serialized object + line="1295">A #GVariant containing a serialized object @@ -19501,7 +19772,7 @@ to the empty OstreeKernelArgs c:identifier="ostree_object_from_string"> Reverse ostree_object_to_string(). + line="1272">Reverse ostree_object_to_string(). @@ -19510,7 +19781,7 @@ to the empty OstreeKernelArgs An ASCII checksum + line="1274">An ASCII checksum transfer-ownership="full"> Parsed checksum + line="1275">Parsed checksum transfer-ownership="full"> Parsed object type + line="1276">Parsed object type @@ -19537,7 +19808,7 @@ to the empty OstreeKernelArgs c:identifier="ostree_object_name_deserialize"> Reverse ostree_object_name_serialize(). Note that @out_checksum is + line="1342">Reverse ostree_object_name_serialize(). Note that @out_checksum is only valid for the lifetime of @variant, and must not be freed. @@ -19547,7 +19818,7 @@ only valid for the lifetime of @variant, and must not be freed. A #GVariant of type (su) + line="1344">A #GVariant of type (su) transfer-ownership="none"> Pointer into string memory of @variant with checksum + line="1345">Pointer into string memory of @variant with checksum transfer-ownership="full"> Return object type + line="1346">Return object type @@ -19576,20 +19847,20 @@ only valid for the lifetime of @variant, and must not be freed. A new floating #GVariant containing checksum string and objtype + line="1331">A new floating #GVariant containing checksum string and objtype An ASCII checksum + line="1328">An ASCII checksum An object type + line="1329">An object type @@ -19599,20 +19870,20 @@ only valid for the lifetime of @variant, and must not be freed. A string containing both @checksum and a stringifed version of @objtype + line="1263">A string containing both @checksum and a stringifed version of @objtype An ASCII checksum + line="1260">An ASCII checksum Object type + line="1261">Object type @@ -19621,7 +19892,7 @@ only valid for the lifetime of @variant, and must not be freed. c:identifier="ostree_object_type_from_string"> The reverse of ostree_object_type_to_string(). + line="1231">The reverse of ostree_object_type_to_string(). @@ -19630,7 +19901,7 @@ only valid for the lifetime of @variant, and must not be freed. A stringified version of #OstreeObjectType + line="1233">A stringified version of #OstreeObjectType @@ -19639,7 +19910,7 @@ only valid for the lifetime of @variant, and must not be freed. c:identifier="ostree_object_type_to_string"> Serialize @objtype to a string; this is used for file extensions. + line="1200">Serialize @objtype to a string; this is used for file extensions. @@ -19648,7 +19919,7 @@ only valid for the lifetime of @variant, and must not be freed. an #OstreeObjectType + line="1202">an #OstreeObjectType @@ -19967,7 +20238,7 @@ will be `gnome-ostree/buildmaster`. In both cases, %TRUE will be returned. throws="1"> Convert from a "bare" file representation into an + line="460">Convert from a "bare" file representation into an OSTREE_OBJECT_TYPE_FILE stream suitable for ostree pull. @@ -19977,13 +20248,13 @@ OSTREE_OBJECT_TYPE_FILE stream suitable for ostree pull. File raw content stream + line="462">File raw content stream A file info + line="463">A file info allow-none="1"> Optional extended attributes + line="464">Optional extended attributes transfer-ownership="full"> Serialized object stream + line="465">Serialized object stream allow-none="1"> Cancellable + line="466">Cancellable @@ -20021,7 +20292,7 @@ OSTREE_OBJECT_TYPE_FILE stream suitable for ostree pull. throws="1"> Like ostree_raw_file_to_archive_z2_stream(), but supports an extensible set + line="487">Like ostree_raw_file_to_archive_z2_stream(), but supports an extensible set of flags. The following flags are currently defined: - `compression-level` (`i`): Level of compression to use, 0–9, with 0 being @@ -20034,13 +20305,13 @@ of flags. The following flags are currently defined: File raw content stream + line="489">File raw content stream A file info + line="490">A file info Optional extended attributes + line="491">Optional extended attributes A GVariant `a{sv}` with an extensible set of flags + line="492">A GVariant `a{sv}` with an extensible set of flags Serialized object stream + line="493">Serialized object stream Cancellable + line="494">Cancellable @@ -20086,7 +20357,7 @@ of flags. The following flags are currently defined: throws="1"> Convert from a "bare" file representation into an + line="527">Convert from a "bare" file representation into an OSTREE_OBJECT_TYPE_FILE stream. This is a fundamental operation for writing data to an #OstreeRepo. @@ -20097,13 +20368,13 @@ for writing data to an #OstreeRepo. File raw content stream + line="529">File raw content stream A file info + line="530">A file info allow-none="1"> Optional extended attributes + line="531">Optional extended attributes transfer-ownership="full"> Serialized object stream + line="532">Serialized object stream transfer-ownership="full"> Length of stream + line="533">Length of stream allow-none="1"> Cancellable + line="534">Cancellable @@ -20160,7 +20431,7 @@ refs are currently on a remote, or the commits they currently point to. Use - + @@ -20456,14 +20727,14 @@ Valid collection IDs are reverse DNS names: %TRUE if @checksum is a valid ASCII SHA256 checksum + line="2055">%TRUE if @checksum is a valid ASCII SHA256 checksum an ASCII string + line="2052">an ASCII string @@ -20473,20 +20744,20 @@ Valid collection IDs are reverse DNS names: throws="1"> Use this to validate the basic structure of @commit, independent of + line="2177">Use this to validate the basic structure of @commit, independent of any other objects it references. %TRUE if @commit is structurally valid + line="2185">%TRUE if @commit is structurally valid A commit object, %OSTREE_OBJECT_TYPE_COMMIT + line="2179">A commit object, %OSTREE_OBJECT_TYPE_COMMIT @@ -20498,14 +20769,14 @@ any other objects it references. %TRUE if @checksum is a valid binary SHA256 checksum + line="2041">%TRUE if @checksum is a valid binary SHA256 checksum a #GVariant of type "ay" + line="2038">a #GVariant of type "ay" @@ -20515,19 +20786,19 @@ any other objects it references. throws="1"> Use this to validate the basic structure of @dirmeta. + line="2329">Use this to validate the basic structure of @dirmeta. %TRUE if @dirmeta is structurally valid + line="2336">%TRUE if @dirmeta is structurally valid A dirmeta object, %OSTREE_OBJECT_TYPE_DIR_META + line="2331">A dirmeta object, %OSTREE_OBJECT_TYPE_DIR_META @@ -20537,20 +20808,20 @@ any other objects it references. throws="1"> Use this to validate the basic structure of @dirtree, independent of + line="2217">Use this to validate the basic structure of @dirtree, independent of any other objects it references. %TRUE if @dirtree is structurally valid + line="2225">%TRUE if @dirtree is structurally valid A dirtree object, %OSTREE_OBJECT_TYPE_DIR_TREE + line="2219">A dirtree object, %OSTREE_OBJECT_TYPE_DIR_TREE @@ -20562,14 +20833,14 @@ any other objects it references. %TRUE if @mode represents a valid file type and permissions + line="2314">%TRUE if @mode represents a valid file type and permissions A Unix filesystem mode + line="2311">A Unix filesystem mode @@ -20581,7 +20852,7 @@ any other objects it references. %TRUE if @objtype represents a valid object type + line="2023">%TRUE if @objtype represents a valid object type diff --git a/rust-bindings/rust/src/auto/content_writer.rs b/rust-bindings/rust/src/auto/content_writer.rs new file mode 100644 index 00000000..47bb01bd --- /dev/null +++ b/rust-bindings/rust/src/auto/content_writer.rs @@ -0,0 +1,42 @@ +// This file was generated by gir (https://github.com/gtk-rs/gir) +// from gir-files (https://github.com/gtk-rs/gir-files) +// DO NOT EDIT + +use gio; +use glib; +use glib::object::IsA; +use glib::translate::*; +use glib::GString; +use ostree_sys; +use std::fmt; +use std::ptr; + +glib_wrapper! { + pub struct ContentWriter(Object) @extends gio::OutputStream; + + match fn { + get_type => || ostree_sys::ostree_content_writer_get_type(), + } +} + +pub const NONE_CONTENT_WRITER: Option<&ContentWriter> = None; + +pub trait ContentWriterExt: 'static { + fn finish>(&self, cancellable: Option<&P>) -> Result; +} + +impl> ContentWriterExt for O { + fn finish>(&self, cancellable: Option<&P>) -> Result { + unsafe { + let mut error = ptr::null_mut(); + let ret = ostree_sys::ostree_content_writer_finish(self.as_ref().to_glib_none().0, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error); + if error.is_null() { Ok(from_glib_full(ret)) } else { Err(from_glib_full(error)) } + } + } +} + +impl fmt::Display for ContentWriter { + fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { + write!(f, "ContentWriter") + } +} diff --git a/rust-bindings/rust/src/auto/gpg_verify_result.rs b/rust-bindings/rust/src/auto/gpg_verify_result.rs index 3e93a604..3a2083a4 100644 --- a/rust-bindings/rust/src/auto/gpg_verify_result.rs +++ b/rust-bindings/rust/src/auto/gpg_verify_result.rs @@ -38,7 +38,7 @@ impl GpgVerifyResult { } } - //pub fn get(&self, signature_index: u32, attrs: /*Unimplemented*/&CArray TypeId { ns_id: 1, id: 29 }) -> Option { + //pub fn get(&self, signature_index: u32, attrs: /*Unimplemented*/&CArray TypeId { ns_id: 1, id: 31 }) -> Option { // unsafe { TODO: call ostree_sys:ostree_gpg_verify_result_get() } //} diff --git a/rust-bindings/rust/src/auto/mod.rs b/rust-bindings/rust/src/auto/mod.rs index 3eebf8e9..128b8b0b 100644 --- a/rust-bindings/rust/src/auto/mod.rs +++ b/rust-bindings/rust/src/auto/mod.rs @@ -9,6 +9,10 @@ pub use self::async_progress::AsyncProgressExt; mod bootconfig_parser; pub use self::bootconfig_parser::{BootconfigParser, BootconfigParserClass}; +mod content_writer; +pub use self::content_writer::{ContentWriter, ContentWriterClass, NONE_CONTENT_WRITER}; +pub use self::content_writer::ContentWriterExt; + mod deployment; pub use self::deployment::{Deployment, DeploymentClass}; @@ -179,6 +183,7 @@ pub use self::constants::TREE_GVARIANT_STRING; #[doc(hidden)] pub mod traits { pub use super::AsyncProgressExt; + pub use super::ContentWriterExt; pub use super::MutableTreeExt; pub use super::RepoFileExt; #[cfg(any(feature = "v2018_6", feature = "dox"))] diff --git a/rust-bindings/rust/src/auto/mutable_tree.rs b/rust-bindings/rust/src/auto/mutable_tree.rs index 18040c21..95b76e05 100644 --- a/rust-bindings/rust/src/auto/mutable_tree.rs +++ b/rust-bindings/rust/src/auto/mutable_tree.rs @@ -60,7 +60,7 @@ pub trait MutableTreeExt: 'static { fn get_metadata_checksum(&self) -> Option; - //fn get_subdirs(&self) -> /*Unknown conversion*//*Unimplemented*/HashTable TypeId { ns_id: 0, id: 28 }/TypeId { ns_id: 1, id: 42 }; + //fn get_subdirs(&self) -> /*Unknown conversion*//*Unimplemented*/HashTable TypeId { ns_id: 0, id: 28 }/TypeId { ns_id: 1, id: 44 }; fn lookup(&self, name: &str) -> Result<(GString, MutableTree), glib::Error>; @@ -127,7 +127,7 @@ impl> MutableTreeExt for O { } } - //fn get_subdirs(&self) -> /*Unknown conversion*//*Unimplemented*/HashTable TypeId { ns_id: 0, id: 28 }/TypeId { ns_id: 1, id: 42 } { + //fn get_subdirs(&self) -> /*Unknown conversion*//*Unimplemented*/HashTable TypeId { ns_id: 0, id: 28 }/TypeId { ns_id: 1, id: 44 } { // unsafe { TODO: call ostree_sys:ostree_mutable_tree_get_subdirs() } //} diff --git a/rust-bindings/rust/src/auto/repo.rs b/rust-bindings/rust/src/auto/repo.rs index ddae0cad..f267c0c9 100644 --- a/rust-bindings/rust/src/auto/repo.rs +++ b/rust-bindings/rust/src/auto/repo.rs @@ -26,6 +26,8 @@ use std::ptr; use AsyncProgress; #[cfg(any(feature = "v2018_6", feature = "dox"))] use CollectionRef; +#[cfg(any(feature = "v2021_2", feature = "dox"))] +use ContentWriter; use GpgVerifyResult; use MutableTree; use ObjectType; @@ -434,7 +436,7 @@ impl Repo { } } - pub fn load_variant_if_exists(&self, objtype: ObjectType, sha256: &str) -> Result { + pub fn load_variant_if_exists(&self, objtype: ObjectType, sha256: &str) -> Result, glib::Error> { unsafe { let mut out_variant = ptr::null_mut(); let mut error = ptr::null_mut(); @@ -998,6 +1000,34 @@ impl Repo { } } + #[cfg(any(feature = "v2021_2", feature = "dox"))] + pub fn write_regfile(&self, expected_checksum: Option<&str>, uid: u32, gid: u32, mode: u32, content_len: u64, xattrs: Option<&glib::Variant>) -> Result { + unsafe { + let mut error = ptr::null_mut(); + let ret = ostree_sys::ostree_repo_write_regfile(self.to_glib_none().0, expected_checksum.to_glib_none().0, uid, gid, mode, content_len, xattrs.to_glib_none().0, &mut error); + if error.is_null() { Ok(from_glib_full(ret)) } else { Err(from_glib_full(error)) } + } + } + + #[cfg(any(feature = "v2021_2", feature = "dox"))] + pub fn write_regfile_inline>(&self, expected_checksum: Option<&str>, uid: u32, gid: u32, mode: u32, xattrs: Option<&glib::Variant>, buf: &[u8], cancellable: Option<&P>) -> Result { + let len = buf.len() as usize; + unsafe { + let mut error = ptr::null_mut(); + let ret = ostree_sys::ostree_repo_write_regfile_inline(self.to_glib_none().0, expected_checksum.to_glib_none().0, uid, gid, mode, xattrs.to_glib_none().0, buf.to_glib_none().0, len, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error); + if error.is_null() { Ok(from_glib_full(ret)) } else { Err(from_glib_full(error)) } + } + } + + #[cfg(any(feature = "v2021_2", feature = "dox"))] + pub fn write_symlink>(&self, expected_checksum: Option<&str>, uid: u32, gid: u32, xattrs: Option<&glib::Variant>, symlink_target: &str, cancellable: Option<&P>) -> Result { + unsafe { + let mut error = ptr::null_mut(); + let ret = ostree_sys::ostree_repo_write_symlink(self.to_glib_none().0, expected_checksum.to_glib_none().0, uid, gid, xattrs.to_glib_none().0, symlink_target.to_glib_none().0, cancellable.map(|p| p.as_ref()).to_glib_none().0, &mut error); + if error.is_null() { Ok(from_glib_full(ret)) } else { Err(from_glib_full(error)) } + } + } + pub fn get_property_remotes_config_dir(&self) -> Option { unsafe { let mut value = Value::from_type(::static_type()); diff --git a/rust-bindings/rust/src/auto/versions.txt b/rust-bindings/rust/src/auto/versions.txt index 0d13f9df..10eb043c 100644 --- a/rust-bindings/rust/src/auto/versions.txt +++ b/rust-bindings/rust/src/auto/versions.txt @@ -1,2 +1,2 @@ Generated by gir (https://github.com/gtk-rs/gir @ 2d1ffab) -from gir-files (https://github.com/gtk-rs/gir-files @ 9fe8b26) +from gir-files (https://github.com/gtk-rs/gir-files @ e4bcf9b+) diff --git a/rust-bindings/rust/sys/Cargo.toml b/rust-bindings/rust/sys/Cargo.toml index a64e2fcf..53eef48f 100644 --- a/rust-bindings/rust/sys/Cargo.toml +++ b/rust-bindings/rust/sys/Cargo.toml @@ -54,6 +54,7 @@ dox = [] v2020_7 = ["v2020_4"] v2020_8 = ["v2020_7"] v2021_1 = ["v2020_8"] +v2021_2 = ["v2021_1"] [lib] name = "ostree_sys" @@ -115,3 +116,4 @@ v2020_4 = "2020.4" v2020_7 = "2020.7" v2020_8 = "2020.8" v2021_1 = "2021.1" +v2021_2 = "2021.2" diff --git a/rust-bindings/rust/sys/src/auto/versions.txt b/rust-bindings/rust/sys/src/auto/versions.txt index 0d13f9df..10eb043c 100644 --- a/rust-bindings/rust/sys/src/auto/versions.txt +++ b/rust-bindings/rust/sys/src/auto/versions.txt @@ -1,2 +1,2 @@ Generated by gir (https://github.com/gtk-rs/gir @ 2d1ffab) -from gir-files (https://github.com/gtk-rs/gir-files @ 9fe8b26) +from gir-files (https://github.com/gtk-rs/gir-files @ e4bcf9b+) diff --git a/rust-bindings/rust/sys/src/lib.rs b/rust-bindings/rust/sys/src/lib.rs index 202605bb..1fd721e5 100644 --- a/rust-bindings/rust/sys/src/lib.rs +++ b/rust-bindings/rust/sys/src/lib.rs @@ -306,6 +306,20 @@ impl ::std::fmt::Debug for OstreeCommitSizesEntry { } } +#[repr(C)] +#[derive(Copy, Clone)] +pub struct OstreeContentWriterClass { + pub parent_class: gio::GOutputStreamClass, +} + +impl ::std::fmt::Debug for OstreeContentWriterClass { + fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { + f.debug_struct(&format!("OstreeContentWriterClass @ {:?}", self as *const _)) + .field("parent_class", &self.parent_class) + .finish() + } +} + #[repr(C)] #[derive(Copy, Clone)] pub struct OstreeDiffDirsOptions { @@ -839,6 +853,16 @@ impl ::std::fmt::Debug for OstreeBootconfigParser { } } +#[repr(C)] +pub struct OstreeContentWriter(c_void); + +impl ::std::fmt::Debug for OstreeContentWriter { + fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { + f.debug_struct(&format!("OstreeContentWriter @ {:?}", self as *const _)) + .finish() + } +} + #[repr(C)] pub struct OstreeDeployment(c_void); @@ -1187,6 +1211,12 @@ extern "C" { pub fn ostree_checksum_input_stream_get_type() -> GType; //pub fn ostree_checksum_input_stream_new(stream: *mut gio::GInputStream, checksum: *mut glib::GChecksum) -> /*Ignored*/*mut OstreeChecksumInputStream; + //========================================================================= + // OstreeContentWriter + //========================================================================= + pub fn ostree_content_writer_get_type() -> GType; + pub fn ostree_content_writer_finish(self_: *mut OstreeContentWriter, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> *mut c_char; + //========================================================================= // OstreeDeployment //========================================================================= @@ -1445,6 +1475,12 @@ extern "C" { pub fn ostree_repo_write_metadata_stream_trusted(self_: *mut OstreeRepo, objtype: OstreeObjectType, checksum: *const c_char, object_input: *mut gio::GInputStream, length: u64, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean; pub fn ostree_repo_write_metadata_trusted(self_: *mut OstreeRepo, objtype: OstreeObjectType, checksum: *const c_char, variant: *mut glib::GVariant, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean; pub fn ostree_repo_write_mtree(self_: *mut OstreeRepo, mtree: *mut OstreeMutableTree, out_file: *mut *mut gio::GFile, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> gboolean; + #[cfg(any(feature = "v2021_2", feature = "dox"))] + pub fn ostree_repo_write_regfile(self_: *mut OstreeRepo, expected_checksum: *const c_char, uid: u32, gid: u32, mode: u32, content_len: u64, xattrs: *mut glib::GVariant, error: *mut *mut glib::GError) -> *mut OstreeContentWriter; + #[cfg(any(feature = "v2021_2", feature = "dox"))] + pub fn ostree_repo_write_regfile_inline(self_: *mut OstreeRepo, expected_checksum: *const c_char, uid: u32, gid: u32, mode: u32, xattrs: *mut glib::GVariant, buf: *const u8, len: size_t, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> *mut c_char; + #[cfg(any(feature = "v2021_2", feature = "dox"))] + pub fn ostree_repo_write_symlink(self_: *mut OstreeRepo, expected_checksum: *const c_char, uid: u32, gid: u32, xattrs: *mut glib::GVariant, symlink_target: *const c_char, cancellable: *mut gio::GCancellable, error: *mut *mut glib::GError) -> *mut c_char; //========================================================================= // OstreeRepoFile diff --git a/rust-bindings/rust/sys/tests/abi.rs b/rust-bindings/rust/sys/tests/abi.rs index 9305bf16..10d9ac4b 100644 --- a/rust-bindings/rust/sys/tests/abi.rs +++ b/rust-bindings/rust/sys/tests/abi.rs @@ -244,6 +244,7 @@ const RUST_LAYOUTS: &[(&str, Layout)] = &[ ("OstreeCollectionRef", Layout {size: size_of::(), alignment: align_of::()}), ("OstreeCollectionRefv", Layout {size: size_of::(), alignment: align_of::()}), ("OstreeCommitSizesEntry", Layout {size: size_of::(), alignment: align_of::()}), + ("OstreeContentWriterClass", Layout {size: size_of::(), alignment: align_of::()}), ("OstreeDeploymentUnlockedState", Layout {size: size_of::(), alignment: align_of::()}), ("OstreeDiffDirsOptions", Layout {size: size_of::(), alignment: align_of::()}), ("OstreeDiffFlags", Layout {size: size_of::(), alignment: align_of::()}),