shaba/ostree
1
0
Fork 0
mirror of https://github.com/ostreedev/ostree.git synced 2025-03-16 10:50:43 +03:00
Code Issues Projects Releases Wiki Activity

config: add new parameter "commit-update-summary" to core section

Browse Source 
When set to true, the summary file is automatically updated after
a commit.

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
This commit is contained in:
Giuseppe Scrivano 2015-04-02 12:33:07 +02:00
parent 362771aa98
commit 9e6ac6d822
4 changed files with 75 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile-tests.am
View File

@ -49,6 +49,7 @@ testfiles = test-basic \
test-setuid \
test-delta \
test-xattrs \
test-auto-summary \
$(NULL)
insttest_SCRIPTS = $(addprefix tests/,$(testfiles:=.sh))

7
doc/ostree.repo-config.xml
View File

@ -84,6 +84,13 @@ Boston, MA 02111-1307, USA.
<listitem><para>Currently, this must be set to <literal>1</literal>.</para></listitem>
</varlistentry>
<varlistentry>
<term><varname>commit-update-summary</varname></term>
<listitem><para>Boolean value controlling whether or not to
automatically update the summary file after a commit. Defaults
to <literal>false</literal>.</para></listitem>
</varlistentry>
<varlistentry>
<term><varname>fsync</varname></term>
<listitem><para>Boolean value controlling whether or not to

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

@ -487,6 +487,7 @@ ostree_builtin_commit (int argc, char **argv, GCancellable *cancellable, GError
if (!skip_commit)
{
gboolean update_summary;
if (!ostree_repo_write_commit (repo, parent, opt_subject, opt_body, metadata,
OSTREE_REPO_FILE (root),
&commit_checksum, cancellable, error))
@ -522,6 +523,17 @@ ostree_builtin_commit (int argc, char **argv, GCancellable *cancellable, GError
if (!ostree_repo_commit_transaction (repo, &stats, cancellable, error))
goto out;
if (!ot_keyfile_get_boolean_with_default (ostree_repo_get_config (repo), "core",
"commit-update-summary", FALSE,
&update_summary, error))
goto out;
if (update_summary && !ostree_repo_regenerate_summary (repo,
NULL,
cancellable,
error))
goto out;
}
else
{

55
tests/test-auto-summary.sh Executable file
View File

@ -0,0 +1,55 @@
#!/bin/bash
#
# Copyright (C) 2011 Colin Walters <walters@verbum.org>
# Copyright (C) 2015 Red Hat, Inc.
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
# License as published by the Free Software Foundation; either
# version 2 of the License, or (at your option) any later version.
#
# This library is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# Lesser General Public License for more details.
#
# You should have received a copy of the GNU Lesser General Public
# License along with this library; if not, write to the
# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
# Boston, MA 02111-1307, USA.
set -e
echo "1..1"
. $(dirname $0)/libtest.sh
setup_test_repository "bare"
echo "ok setup"
mkdir test
echo hello > test/a
${CMD_PREFIX} $OSTREE commit -b test -s "A commit" test
echo "ok commit 1"
${CMD_PREFIX} $OSTREE summary --update
OLD_MD5=$(md5sum repo/summary)
echo hello2 > test/a
${CMD_PREFIX} $OSTREE commit -b test -s "Another commit" test
echo "ok commit 2"
assert_streq $OLD_MD5 $(md5sum repo/summary)
${CMD_PREFIX} $OSTREE --repo=repo config set core.commit-update-summary true
echo hello3 > test/a
${CMD_PREFIX} $OSTREE commit -b test -s "Another commit..." test
echo "ok commit 3"
assert_not_streq $OLD_MD5 $(md5sum repo/summary)