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

lib/config: Rename change-update-summary to auto-... 

Mildly bikeshed, though I find the name `auto-update-summary` to be
easier to grok than `change-update-summary`. I think it's because it can
be read as "verb-verb-noun" rather than "noun-verb-noun".

Closes: #1693
Approved by: mwleeds
This commit is contained in:
Jonathan Lebon 2018-07-30 10:46:58 -04:00 committed by Atomic Bot
parent 3e96ec9811
commit 786ee6bdec
5 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
man/ostree.repo-config.xml
View File

@ -94,7 +94,7 @@ Boston, MA 02111-1307, USA.
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>
<term><varname>change-update-summary</varname></term> <term><varname>auto-update-summary</varname></term>
<listitem><para>Boolean value controlling whether or not to <listitem><para>Boolean value controlling whether or not to
automatically update the summary file after any ref is added, automatically update the summary file after any ref is added,
removed, or updated. This covers a superset of the cases covered by removed, or updated. This covers a superset of the cases covered by

2
src/libostree/ostree-repo-commit.c
View File

@ -2202,7 +2202,7 @@ ostree_repo_commit_transaction (OstreeRepo *self,
return FALSE; return FALSE;
g_clear_pointer (&self->txn.collection_refs, g_hash_table_destroy); g_clear_pointer (&self->txn.collection_refs, g_hash_table_destroy);
/* Update the summary if change-update-summary is set, because doing so was /* Update the summary if auto-update-summary is set, because doing so was
* delayed for each ref change during the transaction. * delayed for each ref change during the transaction.
*/ */
if (!_ostree_repo_maybe_regenerate_summary (self, cancellable, error)) if (!_ostree_repo_maybe_regenerate_summary (self, cancellable, error))

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

@ -5387,7 +5387,7 @@ summary_add_ref_entry (OstreeRepo *self,
* *
* It is regenerated automatically after a commit if * It is regenerated automatically after a commit if
* `core/commit-update-summary` is set, and automatically after any ref is * `core/commit-update-summary` is set, and automatically after any ref is
* added, removed, or updated if `core/change-update-summary` is set. * added, removed, or updated if `core/auto-update-summary` is set.
* *
* If the `core/collection-id` key is set in the configuration, it will be * If the `core/collection-id` key is set in the configuration, it will be
* included as %OSTREE_SUMMARY_COLLECTION_ID in the summary file. Refs that * included as %OSTREE_SUMMARY_COLLECTION_ID in the summary file. Refs that
@ -5593,23 +5593,21 @@ ostree_repo_regenerate_summary (OstreeRepo *self,
return TRUE; return TRUE;
} }
/* Regenerate the summary if `core/change-update-summary` is set */ /* Regenerate the summary if `core/auto-update-summary` is set */
gboolean gboolean
_ostree_repo_maybe_regenerate_summary (OstreeRepo *self, _ostree_repo_maybe_regenerate_summary (OstreeRepo *self,
GCancellable *cancellable, GCancellable *cancellable,
GError **error) GError **error)
{ {
gboolean update_summary; gboolean auto_update_summary;
if (!ot_keyfile_get_boolean_with_default (self->config, "core", if (!ot_keyfile_get_boolean_with_default (self->config, "core",
"change-update-summary", FALSE, "auto-update-summary", FALSE,
&update_summary, error)) &auto_update_summary, error))
return FALSE; return FALSE;
if (update_summary && !ostree_repo_regenerate_summary (self, if (auto_update_summary &&
NULL, !ostree_repo_regenerate_summary (self, NULL, cancellable, error))
cancellable,
error))
return FALSE; return FALSE;
return TRUE; return TRUE;

8
src/ostree/ot-builtin-commit.c
View File

@ -753,7 +753,7 @@ ostree_builtin_commit (int argc, char **argv, OstreeCommandInvocation *invocatio
if (!skip_commit) if (!skip_commit)
{ {
guint64 timestamp; guint64 timestamp;
gboolean change_update_summary; gboolean auto_update_summary;
if (!opt_no_bindings) if (!opt_no_bindings)
{ {
@ -825,12 +825,12 @@ ostree_builtin_commit (int argc, char **argv, OstreeCommandInvocation *invocatio
goto out; goto out;
if (!ot_keyfile_get_boolean_with_default (ostree_repo_get_config (repo), "core", if (!ot_keyfile_get_boolean_with_default (ostree_repo_get_config (repo), "core",
"change-update-summary", FALSE, "auto-update-summary", FALSE,
&change_update_summary, error)) &auto_update_summary, error))
goto out; goto out;
/* No need to update it again if we did for each ref change */ /* No need to update it again if we did for each ref change */
if (opt_orphan || !change_update_summary) if (opt_orphan || !auto_update_summary)
{ {
gboolean commit_update_summary; gboolean commit_update_summary;

6
tests/test-auto-summary.sh
View File

@ -65,7 +65,7 @@ touch repo/summary.sig
$OSTREE summary --update $OSTREE summary --update
assert_not_has_file repo/summary.sig assert_not_has_file repo/summary.sig
# Check that without change-update-summary set, adding, changing, or deleting a ref doesn't update the summary # Check that without auto-update-summary set, adding, changing, or deleting a ref doesn't update the summary
$OSTREE summary --update $OSTREE summary --update
OLD_MD5=$(md5sum repo/summary) OLD_MD5=$(md5sum repo/summary)
$OSTREE commit -b test2 -s "A commit" test $OSTREE commit -b test2 -s "A commit" test
@ -80,8 +80,8 @@ $OSTREE refs --delete test
assert_streq "$OLD_MD5" "$(md5sum repo/summary)" assert_streq "$OLD_MD5" "$(md5sum repo/summary)"
# Check that with change-update-summary set, adding, changing, or deleting a ref updates the summary # Check that with auto-update-summary set, adding, changing, or deleting a ref updates the summary
$OSTREE --repo=repo config set core.change-update-summary true $OSTREE --repo=repo config set core.auto-update-summary true
$OSTREE summary --update $OSTREE summary --update
OLD_MD5=$(md5sum repo/summary) OLD_MD5=$(md5sum repo/summary)