Hello community, here is the log from the commit of package libgit2-glib for openSUSE:Factory checked in at 2014-12-31 11:22:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libgit2-glib (Old) and /work/SRC/openSUSE:Factory/.libgit2-glib.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libgit2-glib" Changes: -------- --- /work/SRC/openSUSE:Factory/libgit2-glib/libgit2-glib.changes 2014-09-30 19:38:29.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libgit2-glib.new/libgit2-glib.changes 2014-12-31 11:22:33.000000000 +0100 @@ -1,0 +2,7 @@ +Mon Dec 29 22:01:48 UTC 2014 - [email protected] + +- Update to version 0.0.24: + + Support Notes. + + Misc bugfixing. + +------------------------------------------------------------------- Old: ---- libgit2-glib-0.0.22.tar.xz New: ---- libgit2-glib-0.0.24.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libgit2-glib.spec ++++++ --- /var/tmp/diff_new_pack.e6UlD0/_old 2014-12-31 11:22:33.000000000 +0100 +++ /var/tmp/diff_new_pack.e6UlD0/_new 2014-12-31 11:22:33.000000000 +0100 @@ -18,7 +18,7 @@ Name: libgit2-glib -Version: 0.0.22 +Version: 0.0.24 Release: 0 Summary: Glib wrapper library around libgit2 License: LGPL-2.1+ ++++++ libgit2-glib-0.0.22.tar.xz -> libgit2-glib-0.0.24.tar.xz ++++++ ++++ 2801 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libgit2-glib-0.0.22/ChangeLog new/libgit2-glib-0.0.24/ChangeLog --- old/libgit2-glib-0.0.22/ChangeLog 2014-09-15 20:33:51.000000000 +0200 +++ new/libgit2-glib-0.0.24/ChangeLog 2014-11-04 17:01:29.000000000 +0100 @@ -1,6 +1,85 @@ +commit 0f4bf192d2866fb3e054b569437f29664c5b8f1e +Author: Ignacio Casal Quinteiro <[email protected]> +Date: 2014-10-19 + + Use the right type for the user data + +M libgit2-glib/ggit-types.h + +commit b9bed9d9d5eb65a19e1ac89c11e7eff4dc7f6f99 +Author: Ignacio Casal Quinteiro <[email protected]> +Date: 2014-10-19 + + Bind for ggit_repository_note_foreach + +M libgit2-glib/ggit-repository.c +M libgit2-glib/ggit-repository.h +M libgit2-glib/ggit-types.h + +commit 4ac4549fc0f03a231f2fb59a532ff7e8aa20c3d0 +Author: Ignacio Casal Quinteiro <[email protected]> +Date: 2014-10-18 + + repository: improve docs + +M libgit2-glib/ggit-repository.c + +commit 560add3c8fe3328d3d6ae3f4f883f686d8f0f914 +Author: Ignacio Casal Quinteiro <[email protected]> +Date: 2014-10-18 + + Provide ggit_repository_read_note + +M libgit2-glib/ggit-repository.c +M libgit2-glib/ggit-repository.h + +commit cd18205884b0ef6ad93ca75cb4ebcce25e89a3eb +Author: Ignacio Casal Quinteiro <[email protected]> +Date: 2014-10-18 + + Basic wrapping for GgitNote + +M libgit2-glib/Makefile.am +A libgit2-glib/ggit-note.c +A libgit2-glib/ggit-note.h +M libgit2-glib/ggit-repository.c +M libgit2-glib/ggit-repository.h +M libgit2-glib/ggit-types.h + +commit 290f483222bc9805474f344d094358dd6ab052af +Author: Christian Hergert <[email protected]> +Date: 2014-09-28 + + Fix user_data parameter in ggit_diff_blob_to_buffer() + + gpointer is already a (void *), so the extra * only causes type + warnings + with the compiler. No ABI break necessary. + +M libgit2-glib/ggit-diff.c +M libgit2-glib/ggit-diff.h + +commit b35ef3013d5fa3a17d897dd834a29489837f8471 +Author: Ignacio Casal Quinteiro <[email protected]> +Date: 2014-09-15 + + Post release version bump to 0.0.23 + +M configure.ac + +commit a3b598538780d22a22fde08cc2e3db14ccd2681e +Author: Ignacio Casal Quinteiro <[email protected]> +Date: 2014-09-15 + + Release 0.0.22 + +M NEWS +M README +M configure.ac + commit a76152e2e1992a013a53105a95d16f4617ac0c28 Author: Jesse van den Kieboom <[email protected]> -Date: 2014-09-12 +Date: 2014-09-12 Check for availability of termios.h for clone example diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libgit2-glib-0.0.22/INSTALL new/libgit2-glib-0.0.24/INSTALL --- old/libgit2-glib-0.0.22/INSTALL 2014-09-15 20:27:49.000000000 +0200 +++ new/libgit2-glib-0.0.24/INSTALL 2014-11-04 17:01:09.000000000 +0100 @@ -12,8 +12,8 @@ Basic Installation ================== - Briefly, the shell commands `./configure; make; make install' should -configure, build, and install this package. The following + Briefly, the shell command `./configure && make && make install' +should configure, build, and install this package. The following more-detailed instructions are generic; see the `README' file for instructions specific to this package. Some packages provide this `INSTALL' file but do not implement all of the features documented diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libgit2-glib-0.0.22/NEWS new/libgit2-glib-0.0.24/NEWS --- old/libgit2-glib-0.0.22/NEWS 2014-09-15 20:27:41.000000000 +0200 +++ new/libgit2-glib-0.0.24/NEWS 2014-11-04 17:00:55.000000000 +0100 @@ -1,3 +1,8 @@ +News in 0.0.24 +-------------- +* Support Notes +* Misc bugfixing + News in 0.0.22 -------------- * More API support diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libgit2-glib-0.0.22/README new/libgit2-glib-0.0.24/README --- old/libgit2-glib-0.0.22/README 2014-09-15 20:27:41.000000000 +0200 +++ new/libgit2-glib-0.0.24/README 2014-11-04 17:00:12.000000000 +0100 @@ -20,8 +20,8 @@ Simple install procedure: - % tar Jxf libgit2-glib-0.0.22.tar.xz # unpack the sources - % cd libgit2-glib-0.0.22 # change to the toplevel directory + % tar Jxf libgit2-glib-0.0.24.tar.xz # unpack the sources + % cd libgit2-glib-0.0.24 # change to the toplevel directory % ./configure # run the `configure' script % make # build libgit2-glib [ Become root if necessary ] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libgit2-glib-0.0.22/compile new/libgit2-glib-0.0.24/compile --- old/libgit2-glib-0.0.22/compile 1970-01-01 01:00:00.000000000 +0100 +++ new/libgit2-glib-0.0.24/compile 2014-11-04 17:01:09.000000000 +0100 @@ -0,0 +1,347 @@ +#! /bin/sh +# Wrapper for compilers which do not understand '-c -o'. + +scriptversion=2012-10-14.11; # UTC + +# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Written by Tom Tromey <[email protected]>. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This program 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 General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +# This file is maintained in Automake, please report +# bugs to <[email protected]> or send patches to +# <[email protected]>. + +nl=' +' + +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent tools from complaining about whitespace usage. +IFS=" "" $nl" + +file_conv= + +# func_file_conv build_file lazy +# Convert a $build file to $host form and store it in $file +# Currently only supports Windows hosts. If the determined conversion +# type is listed in (the comma separated) LAZY, no conversion will +# take place. +func_file_conv () +{ + file=$1 + case $file in + / | /[!/]*) # absolute file, and not a UNC file + if test -z "$file_conv"; then + # lazily determine how to convert abs files + case `uname -s` in + MINGW*) + file_conv=mingw + ;; + CYGWIN*) + file_conv=cygwin + ;; + *) + file_conv=wine + ;; + esac + fi + case $file_conv/,$2, in + *,$file_conv,*) + ;; + mingw/*) + file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` + ;; + cygwin/*) + file=`cygpath -m "$file" || echo "$file"` + ;; + wine/*) + file=`winepath -w "$file" || echo "$file"` + ;; + esac + ;; + esac +} + +# func_cl_dashL linkdir +# Make cl look for libraries in LINKDIR +func_cl_dashL () +{ + func_file_conv "$1" + if test -z "$lib_path"; then + lib_path=$file + else + lib_path="$lib_path;$file" + fi + linker_opts="$linker_opts -LIBPATH:$file" +} + +# func_cl_dashl library +# Do a library search-path lookup for cl +func_cl_dashl () +{ + lib=$1 + found=no + save_IFS=$IFS + IFS=';' + for dir in $lib_path $LIB + do + IFS=$save_IFS + if $shared && test -f "$dir/$lib.dll.lib"; then + found=yes + lib=$dir/$lib.dll.lib + break + fi + if test -f "$dir/$lib.lib"; then + found=yes + lib=$dir/$lib.lib + break + fi + if test -f "$dir/lib$lib.a"; then + found=yes + lib=$dir/lib$lib.a + break + fi + done + IFS=$save_IFS + + if test "$found" != yes; then + lib=$lib.lib + fi +} + +# func_cl_wrapper cl arg... +# Adjust compile command to suit cl +func_cl_wrapper () +{ + # Assume a capable shell + lib_path= + shared=: + linker_opts= + for arg + do + if test -n "$eat"; then + eat= + else + case $1 in + -o) + # configure might choose to run compile as 'compile cc -o foo foo.c'. + eat=1 + case $2 in + *.o | *.[oO][bB][jJ]) + func_file_conv "$2" + set x "$@" -Fo"$file" + shift + ;; + *) + func_file_conv "$2" + set x "$@" -Fe"$file" + shift + ;; + esac + ;; + -I) + eat=1 + func_file_conv "$2" mingw + set x "$@" -I"$file" + shift + ;; + -I*) + func_file_conv "${1#-I}" mingw + set x "$@" -I"$file" + shift + ;; + -l) + eat=1 + func_cl_dashl "$2" + set x "$@" "$lib" + shift + ;; + -l*) + func_cl_dashl "${1#-l}" + set x "$@" "$lib" + shift + ;; + -L) + eat=1 + func_cl_dashL "$2" + ;; + -L*) + func_cl_dashL "${1#-L}" + ;; + -static) + shared=false + ;; + -Wl,*) + arg=${1#-Wl,} + save_ifs="$IFS"; IFS=',' + for flag in $arg; do + IFS="$save_ifs" + linker_opts="$linker_opts $flag" + done + IFS="$save_ifs" + ;; + -Xlinker) + eat=1 + linker_opts="$linker_opts $2" + ;; + -*) + set x "$@" "$1" + shift + ;; + *.cc | *.CC | *.cxx | *.CXX | *.[cC]++) + func_file_conv "$1" + set x "$@" -Tp"$file" + shift + ;; + *.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO]) + func_file_conv "$1" mingw + set x "$@" "$file" + shift + ;; + *) + set x "$@" "$1" + shift + ;; + esac + fi + shift + done + if test -n "$linker_opts"; then + linker_opts="-link$linker_opts" + fi + exec "$@" $linker_opts + exit 1 +} + +eat= + +case $1 in + '') + echo "$0: No command. Try '$0 --help' for more information." 1>&2 + exit 1; + ;; + -h | --h*) + cat <<\EOF +Usage: compile [--help] [--version] PROGRAM [ARGS] + +Wrapper for compilers which do not understand '-c -o'. +Remove '-o dest.o' from ARGS, run PROGRAM with the remaining +arguments, and rename the output as expected. + +If you are trying to build a whole package this is not the +right script to run: please start by reading the file 'INSTALL'. + +Report bugs to <[email protected]>. +EOF + exit $? + ;; + -v | --v*) + echo "compile $scriptversion" + exit $? + ;; + cl | *[/\\]cl | cl.exe | *[/\\]cl.exe ) + func_cl_wrapper "$@" # Doesn't return... + ;; +esac + +ofile= +cfile= + +for arg +do + if test -n "$eat"; then + eat= + else + case $1 in + -o) + # configure might choose to run compile as 'compile cc -o foo foo.c'. + # So we strip '-o arg' only if arg is an object. + eat=1 + case $2 in + *.o | *.obj) + ofile=$2 + ;; + *) + set x "$@" -o "$2" + shift + ;; + esac + ;; + *.c) + cfile=$1 + set x "$@" "$1" + shift + ;; + *) + set x "$@" "$1" + shift + ;; + esac + fi + shift +done + +if test -z "$ofile" || test -z "$cfile"; then + # If no '-o' option was seen then we might have been invoked from a + # pattern rule where we don't need one. That is ok -- this is a + # normal compilation that the losing compiler can handle. If no + # '.c' file was seen then we are probably linking. That is also + # ok. + exec "$@" +fi + +# Name of file we expect compiler to create. +cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'` + +# Create the lock directory. +# Note: use '[/\\:.-]' here to ensure that we don't use the same name +# that we are using for the .o file. Also, base the name on the expected +# object file name, since that is what matters with a parallel build. +lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d +while true; do + if mkdir "$lockdir" >/dev/null 2>&1; then + break + fi + sleep 1 +done +# FIXME: race condition here if user kills between mkdir and trap. +trap "rmdir '$lockdir'; exit 1" 1 2 15 + +# Run the compile. +"$@" +ret=$? + +if test -f "$cofile"; then + test "$cofile" = "$ofile" || mv "$cofile" "$ofile" +elif test -f "${cofile}bj"; then + test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile" +fi + +rmdir "$lockdir" +exit $ret + +# Local Variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" +# End: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libgit2-glib-0.0.22/configure.ac new/libgit2-glib-0.0.24/configure.ac --- old/libgit2-glib-0.0.22/configure.ac 2014-09-15 20:27:41.000000000 +0200 +++ new/libgit2-glib-0.0.24/configure.ac 2014-11-04 17:00:03.000000000 +0100 @@ -2,7 +2,7 @@ m4_define(libgit2_glib_major_version, 0) m4_define(libgit2_glib_minor_version, 0) -m4_define(libgit2_glib_micro_version, 22) +m4_define(libgit2_glib_micro_version, 24) m4_define(libgit2_glib_version, libgit2_glib_major_version.libgit2_glib_minor_version.libgit2_glib_micro_version) AC_INIT([libgit2-glib], diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libgit2-glib-0.0.22/docs/reference/html/GgitDiff.html new/libgit2-glib-0.0.24/docs/reference/html/GgitDiff.html --- old/libgit2-glib-0.0.22/docs/reference/html/GgitDiff.html 2014-09-15 20:33:51.000000000 +0200 +++ new/libgit2-glib-0.0.24/docs/reference/html/GgitDiff.html 2014-11-04 17:01:29.000000000 +0100 @@ -806,7 +806,7 @@ <em class="parameter"><code><a class="link" href="GgitDiff.html#GgitDiffFileCallback" title="GgitDiffFileCallback ()"><span class="type">GgitDiffFileCallback</span></a> file_cb</code></em>, <em class="parameter"><code><a class="link" href="GgitDiff.html#GgitDiffHunkCallback" title="GgitDiffHunkCallback ()"><span class="type">GgitDiffHunkCallback</span></a> hunk_cb</code></em>, <em class="parameter"><code><a class="link" href="GgitDiff.html#GgitDiffLineCallback" title="GgitDiffLineCallback ()"><span class="type">GgitDiffLineCallback</span></a> line_cb</code></em>, - <em class="parameter"><code><span class="type">gpointer</span> *user_data</code></em>, + <em class="parameter"><code><span class="type">gpointer</span> user_data</code></em>, <em class="parameter"><code><span class="type">GError</span> **error</code></em>);</pre> <p>Same as <a class="link" href="GgitDiff.html#ggit-diff-blobs" title="ggit_diff_blobs ()"><code class="function">ggit_diff_blobs()</code></a> but using a buffer.</p> <div class="refsect3"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libgit2-glib-0.0.22/docs/reference/html/GgitRepository.html new/libgit2-glib-0.0.24/docs/reference/html/GgitRepository.html --- old/libgit2-glib-0.0.22/docs/reference/html/GgitRepository.html 2014-09-15 20:33:51.000000000 +0200 +++ new/libgit2-glib-0.0.24/docs/reference/html/GgitRepository.html 2014-11-04 17:01:29.000000000 +0100 @@ -607,7 +607,7 @@ <span class="c_punctuation">(</span>*GgitStashCallback<span class="c_punctuation">)</span> (<em class="parameter"><code><span class="type">gsize</span> index</code></em>, <em class="parameter"><code>const <span class="type">gchar</span> *message</code></em>, <em class="parameter"><code><a class="link" href="GgitOId.html" title="GgitOId"><span class="type">GgitOId</span></a> *stash_oid</code></em>, - <em class="parameter"><code><span class="type">gpointer</span> *user_data</code></em>);</pre> + <em class="parameter"><code><span class="type">gpointer</span> user_data</code></em>);</pre> <p>When iterating over all the stashed states, callback that will be issued per entry. See <a class="link" href="GgitRepository.html#ggit-repository-stash-foreach" title="ggit_repository_stash_foreach ()"><code class="function">ggit_repository_stash_foreach()</code></a>.</p> <div class="refsect3"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libgit2-glib-0.0.22/docs/reference/html/api-index-full.html new/libgit2-glib-0.0.24/docs/reference/html/api-index-full.html --- old/libgit2-glib-0.0.22/docs/reference/html/api-index-full.html 2014-09-15 20:33:51.000000000 +0200 +++ new/libgit2-glib-0.0.24/docs/reference/html/api-index-full.html 2014-11-04 17:01:29.000000000 +0100 @@ -661,11 +661,11 @@ <dd></dd> <a name="idxE"></a><h3 class="title">E</h3> <dt> -<a class="link" href="libgit2-glib-1.0-GgitError.html#GGIT-ERROR:CAPS" title="GGIT_ERROR">GGIT_ERROR</a>, macro in <a class="link" href="libgit2-glib-1.0-GgitError.html" title="GgitError">GgitError</a> +<a class="link" href="libgit2-glib-1.0-GgitError.html#GgitError" title="enum GgitError">GgitError</a>, enum in <a class="link" href="libgit2-glib-1.0-GgitError.html" title="GgitError">GgitError</a> </dt> <dd></dd> <dt> -<a class="link" href="libgit2-glib-1.0-GgitError.html#GgitError" title="enum GgitError">GgitError</a>, enum in <a class="link" href="libgit2-glib-1.0-GgitError.html" title="GgitError">GgitError</a> +<a class="link" href="libgit2-glib-1.0-GgitError.html#GGIT-ERROR:CAPS" title="GGIT_ERROR">GGIT_ERROR</a>, macro in <a class="link" href="libgit2-glib-1.0-GgitError.html" title="GgitError">GgitError</a> </dt> <dd></dd> <dt> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libgit2-glib-0.0.22/docs/reference/html/index.html new/libgit2-glib-0.0.24/docs/reference/html/index.html --- old/libgit2-glib-0.0.22/docs/reference/html/index.html 2014-09-15 20:33:51.000000000 +0200 +++ new/libgit2-glib-0.0.24/docs/reference/html/index.html 2014-11-04 17:01:29.000000000 +0100 @@ -14,7 +14,7 @@ <div class="titlepage"> <div> <div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">libgit2-glib Reference Manual</p></th></tr></table></div> -<div><p class="releaseinfo">for libgit2-glib 0.0.22 +<div><p class="releaseinfo">for libgit2-glib 0.0.24 </p></div> </div> <hr> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libgit2-glib-0.0.22/docs/reference/libgit2-glib-1.0.types new/libgit2-glib-0.0.24/docs/reference/libgit2-glib-1.0.types --- old/libgit2-glib-0.0.22/docs/reference/libgit2-glib-1.0.types 2014-09-15 20:33:51.000000000 +0200 +++ new/libgit2-glib-0.0.24/docs/reference/libgit2-glib-1.0.types 2014-11-04 17:01:29.000000000 +0100 @@ -52,6 +52,7 @@ ggit_merge_options_get_type ggit_merge_tree_flags_get_type ggit_native_get_type +ggit_note_get_type ggit_object_factory_base_get_type ggit_object_factory_get_type ggit_object_get_type diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libgit2-glib-0.0.22/docs/reference/version.xml new/libgit2-glib-0.0.24/docs/reference/version.xml --- old/libgit2-glib-0.0.22/docs/reference/version.xml 2014-09-15 20:27:51.000000000 +0200 +++ new/libgit2-glib-0.0.24/docs/reference/version.xml 2014-11-04 17:01:11.000000000 +0100 @@ -1 +1 @@ -0.0.22 +0.0.24 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libgit2-glib-0.0.22/libgit2-glib/Makefile.am new/libgit2-glib-0.0.24/libgit2-glib/Makefile.am --- old/libgit2-glib-0.0.22/libgit2-glib/Makefile.am 2014-09-15 20:16:26.000000000 +0200 +++ new/libgit2-glib-0.0.24/libgit2-glib/Makefile.am 2014-10-18 12:42:52.000000000 +0200 @@ -47,6 +47,7 @@ ggit-message.h \ ggit-merge-options.h \ ggit-native.h \ + ggit-note.h \ ggit-object.h \ ggit-object-factory.h \ ggit-object-factory-base.h \ @@ -111,6 +112,7 @@ ggit-message.c \ ggit-merge-options.c \ ggit-native.c \ + ggit-note.c \ ggit-object.c \ ggit-object-factory.c \ ggit-object-factory-base.c \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libgit2-glib-0.0.22/libgit2-glib/ggit-diff.c new/libgit2-glib-0.0.24/libgit2-glib/ggit-diff.c --- old/libgit2-glib-0.0.22/libgit2-glib/ggit-diff.c 2014-09-15 20:16:26.000000000 +0200 +++ new/libgit2-glib-0.0.24/libgit2-glib/ggit-diff.c 2014-10-18 12:42:52.000000000 +0200 @@ -766,7 +766,7 @@ GgitDiffFileCallback file_cb, GgitDiffHunkCallback hunk_cb, GgitDiffLineCallback line_cb, - gpointer *user_data, + gpointer user_data, GError **error) { gint ret; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libgit2-glib-0.0.22/libgit2-glib/ggit-diff.h new/libgit2-glib-0.0.24/libgit2-glib/ggit-diff.h --- old/libgit2-glib-0.0.22/libgit2-glib/ggit-diff.h 2014-09-15 20:16:26.000000000 +0200 +++ new/libgit2-glib-0.0.24/libgit2-glib/ggit-diff.h 2014-10-18 12:42:52.000000000 +0200 @@ -120,7 +120,7 @@ GgitDiffFileCallback file_cb, GgitDiffHunkCallback hunk_cb, GgitDiffLineCallback line_cb, - gpointer *user_data, + gpointer user_data, GError **error); gboolean ggit_diff_find_similar (GgitDiff *diff, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libgit2-glib-0.0.22/libgit2-glib/ggit-note.c new/libgit2-glib-0.0.24/libgit2-glib/ggit-note.c --- old/libgit2-glib-0.0.22/libgit2-glib/ggit-note.c 1970-01-01 01:00:00.000000000 +0100 +++ new/libgit2-glib-0.0.24/libgit2-glib/ggit-note.c 2014-10-18 12:42:52.000000000 +0200 @@ -0,0 +1,121 @@ +/* + * ggit-note.c + * This file is part of libgit2-glib + * + * Copyright (C) 2014 - Ignacio Casal Quinteiro + * + * libgit2-glib 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.1 of the License, or (at your option) any later version. + * + * libgit2-glib 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 libgit2-glib. If not, see <http://www.gnu.org/licenses/>. + */ + +#include "ggit-note.h" +#include "ggit-oid.h" + +struct _GgitNote +{ + gint ref_count; + + git_note *note; + GgitOId *id; +}; + +G_DEFINE_BOXED_TYPE (GgitNote, ggit_note, + ggit_note_ref, ggit_note_unref) + +GgitNote * +_ggit_note_wrap (git_note *note) +{ + GgitNote *gnote; + + g_return_val_if_fail (note != NULL, NULL); + + gnote = g_slice_new (GgitNote); + gnote->ref_count = 1; + gnote->note = note; + gnote->id = _ggit_oid_wrap (git_note_id (note)); + + return gnote; +} + +/** + * ggit_note_ref: + * @note: a #GgitNote. + * + * Atomically increments the reference count of @note by one. + * This function is MT-safe and may be called from any thread. + * + * Returns: a #GgitNote. + **/ +GgitNote * +ggit_note_ref (GgitNote *note) +{ + g_return_val_if_fail (note != NULL, NULL); + + g_atomic_int_inc (¬e->ref_count); + + return note; +} + +/** + * ggit_note_unref: + * @note: a #GgitNote. + * + * Atomically decrements the reference count of @note by one. + * If the reference count drops to 0, @note is freed. + **/ +void +ggit_note_unref (GgitNote *note) +{ + g_return_if_fail (note != NULL); + + if (g_atomic_int_dec_and_test (¬e->ref_count)) + { + git_note_free (note->note); + ggit_oid_free (note->id); + g_slice_free (GgitNote, note); + } +} + +/** + * ggit_note_get_message: + * @note: a #GgitNote. + * + * Gets the note message. + * + * Returns: the note message. + */ +const gchar * +ggit_note_get_message (GgitNote *note) +{ + g_return_val_if_fail (note != NULL, NULL); + + return git_note_message (note->note); +} + +/** + * ggit_note_get_id: + * @note: a #GgitNote. + * + * Gets the note object's id. + * + * Returns: (transfer none): the object's id. + */ +GgitOId * +ggit_note_get_id (GgitNote *note) +{ + g_return_val_if_fail (note != NULL, NULL); + + return note->id; +} + +/* ex:set ts=8 noet: */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libgit2-glib-0.0.22/libgit2-glib/ggit-note.h new/libgit2-glib-0.0.24/libgit2-glib/ggit-note.h --- old/libgit2-glib-0.0.22/libgit2-glib/ggit-note.h 1970-01-01 01:00:00.000000000 +0100 +++ new/libgit2-glib-0.0.24/libgit2-glib/ggit-note.h 2014-10-18 12:42:52.000000000 +0200 @@ -0,0 +1,49 @@ +/* + * ggit-note.h + * This file is part of libgit2-glib + * + * Copyright (C) 2014 - Ignacio Casal Quinteiro + * + * libgit2-glib 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.1 of the License, or (at your option) any later version. + * + * libgit2-glib 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 libgit2-glib. If not, see <http://www.gnu.org/licenses/>. + */ + +#ifndef __GGIT_NOTE_H__ +#define __GGIT_NOTE_H__ + +#include <glib-object.h> +#include <git2.h> + +#include "ggit-types.h" + +G_BEGIN_DECLS + +#define GGIT_TYPE_NOTE (ggit_note_get_type ()) +#define GGIT_NOTE(obj) ((GgitNote *)obj) + +GType ggit_note_get_type (void) G_GNUC_CONST; + +GgitNote *_ggit_note_wrap (git_note *note); + +GgitNote *ggit_note_ref (GgitNote *note); +void ggit_note_unref (GgitNote *note); + +const gchar *ggit_note_get_message (GgitNote *note); + +GgitOId *ggit_note_get_id (GgitNote *note); + +G_END_DECLS + +#endif /* __GGIT_NOTE_H__ */ + +/* ex:set ts=8 noet: */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libgit2-glib-0.0.22/libgit2-glib/ggit-repository.c new/libgit2-glib-0.0.24/libgit2-glib/ggit-repository.c --- old/libgit2-glib-0.0.22/libgit2-glib/ggit-repository.c 2014-09-15 20:16:26.000000000 +0200 +++ new/libgit2-glib-0.0.24/libgit2-glib/ggit-repository.c 2014-10-19 11:52:11.000000000 +0200 @@ -2992,4 +2992,243 @@ return _ggit_index_wrap (idx); } +/** + * ggit_repository_get_default_notes_ref: + * @repository: a #GgitRepository. + * @error: a #GError for error reporting, or %NULL. + * + * Gets the default notes reference for @repository. It defaults to + * "refs/notes/commits". + * + * Returns: the default notes reference for @repository. + */ +const gchar * +ggit_repository_get_default_notes_ref (GgitRepository *repository, + GError **error) +{ + const gchar *ref = NULL; + gint ret; + + g_return_val_if_fail (GGIT_IS_REPOSITORY (repository), NULL); + g_return_val_if_fail (error == NULL || *error == NULL, FALSE); + + ret = git_note_default_ref (&ref, _ggit_native_get (repository)); + + if (ret != GIT_OK) + { + _ggit_error_set (error, ret); + return NULL; + } + + return ref; +} + +/** + * ggit_repository_create_note: + * @repository: a #GgitRepository. + * @author: author signature. + * @committer: committer signature. + * @notes_ref: (allow-none): canonical name of the reference to use, or %NULL to use the default ref. + * @id: OID of the git object to decorate. + * @note: content of the note to add for object oid. + * @force: whether to overwrite existing note. + * @error: a #GError for error reporting, or %NULL. + * + * Adds a note for an object. + * + * Returns: (transfer full): the OID for the note or %NULL in case of error. + */ +GgitOId * +ggit_repository_create_note (GgitRepository *repository, + GgitSignature *author, + GgitSignature *committer, + const gchar *notes_ref, + GgitOId *id, + const gchar *note, + gboolean force, + GError **error) +{ + gint ret; + git_oid oid; + + g_return_val_if_fail (GGIT_IS_REPOSITORY (repository), NULL); + g_return_val_if_fail (GGIT_IS_SIGNATURE (author), NULL); + g_return_val_if_fail (GGIT_IS_SIGNATURE (committer), NULL); + g_return_val_if_fail (id != NULL, NULL); + g_return_val_if_fail (note != NULL, NULL); + g_return_val_if_fail (error == NULL || *error == NULL, FALSE); + + ret = git_note_create (&oid, + _ggit_native_get (repository), + _ggit_native_get (author), + _ggit_native_get (committer), + notes_ref, + _ggit_oid_get_oid (id), + note, + force); + + if (ret != GIT_OK) + { + _ggit_error_set (error, ret); + return NULL; + } + + return _ggit_oid_wrap (&oid); +} + +/** + * ggit_repository_remove_note: + * @repository: a #GgitRepository. + * @notes_ref: (allow-none): canonical name of the reference to use, or %NULL to use the default ref. + * @author: author signature. + * @committer: committer signature. + * @id: OID of the git object to decorate. + * @error: a #GError for error reporting, or %NULL. + * + * Removes the note for an object. + * + * Returns: %TRUE if the note was removed from @id. + */ +gboolean +ggit_repository_remove_note (GgitRepository *repository, + const gchar *notes_ref, + GgitSignature *author, + GgitSignature *committer, + GgitOId *id, + GError **error) +{ + gint ret; + + g_return_val_if_fail (GGIT_IS_REPOSITORY (repository), FALSE); + g_return_val_if_fail (GGIT_IS_SIGNATURE (author), FALSE); + g_return_val_if_fail (GGIT_IS_SIGNATURE (committer), FALSE); + g_return_val_if_fail (id != NULL, FALSE); + g_return_val_if_fail (error == NULL || *error == NULL, FALSE); + + ret = git_note_remove (_ggit_native_get (repository), + notes_ref, + _ggit_native_get (author), + _ggit_native_get (committer), + _ggit_oid_get_oid (id)); + + if (ret != GIT_OK) + { + _ggit_error_set (error, ret); + return FALSE; + } + + return TRUE; +} + +/** + * ggit_repository_read_note: + * @repository: a #GgitRepository. + * @notes_ref: (allow-none): canonical name of the reference to use, or %NULL to use the default ref. + * @id: OID of the git object to decorate. + * @error: a #GError for error reporting, or %NULL. + * + * Reads the note for an object. + * + * Returns: (transfer full): the read note or %NULL in case of an error. + */ +GgitNote * +ggit_repository_read_note (GgitRepository *repository, + const gchar *notes_ref, + GgitOId *id, + GError **error) +{ + gint ret; + git_note *note; + + g_return_val_if_fail (GGIT_IS_REPOSITORY (repository), FALSE); + g_return_val_if_fail (id != NULL, FALSE); + g_return_val_if_fail (error == NULL || *error == NULL, FALSE); + + ret = git_note_read (¬e, + _ggit_native_get (repository), + notes_ref, + _ggit_oid_get_oid (id)); + + if (ret != GIT_OK) + { + _ggit_error_set (error, ret); + return FALSE; + } + + return _ggit_note_wrap (note); +} + +typedef struct +{ + gpointer user_data; + + GgitNoteCallback callback; +} NoteCallbackWrapperData; + +static gint +note_callback_wrapper (const git_oid *blob_id, + const git_oid *annotated_object_id, + gpointer user_data) +{ + NoteCallbackWrapperData *wrapper_data = (NoteCallbackWrapperData *)user_data; + GgitOId *gblob_id; + GgitOId *gannotated_object_id; + gint ret; + + gblob_id = _ggit_oid_wrap (blob_id); + gannotated_object_id = _ggit_oid_wrap (annotated_object_id); + + ret = wrapper_data->callback (gblob_id, gannotated_object_id, + wrapper_data->user_data); + ggit_oid_free (gblob_id); + ggit_oid_free (gannotated_object_id); + + return ret; +} + +/** + * ggit_repository_note_foreach: + * @repository: a #GgitRepository. + * @notes_ref: (allow-none): canonical name of the reference to use, or %NULL to use the default ref. + * @callback: (scope call): a #GgitNoteCallback. + * @user_data: callback user data. + * @error: a #GError for error reporting, or %NULL. + * + * Loop over all the notes within a specified namespace + * and issue a callback for each one. + * If @callback returns a non-zero value, this will stop looping. + + * Returns: %TRUE if there was no error, %FALSE otherwise. + */ +gboolean +ggit_repository_note_foreach (GgitRepository *repository, + const gchar *notes_ref, + GgitNoteCallback callback, + gpointer user_data, + GError **error) +{ + NoteCallbackWrapperData wrapper_data; + gint ret; + + g_return_val_if_fail (GGIT_IS_REPOSITORY (repository), FALSE); + g_return_val_if_fail (callback != NULL, FALSE); + g_return_val_if_fail (error == NULL || *error == NULL, FALSE); + + wrapper_data.user_data = user_data; + wrapper_data.callback = callback; + + ret = git_note_foreach (_ggit_native_get (repository), + notes_ref, + note_callback_wrapper, + &wrapper_data); + + if (ret != GIT_OK) + { + _ggit_error_set (error, ret); + return FALSE; + } + + return TRUE; +} + /* ex:set ts=8 noet: */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libgit2-glib-0.0.22/libgit2-glib/ggit-repository.h new/libgit2-glib-0.0.24/libgit2-glib/ggit-repository.h --- old/libgit2-glib-0.0.22/libgit2-glib/ggit-repository.h 2014-09-15 20:16:26.000000000 +0200 +++ new/libgit2-glib-0.0.24/libgit2-glib/ggit-repository.h 2014-10-19 11:46:47.000000000 +0200 @@ -34,6 +34,7 @@ #include <libgit2-glib/ggit-branch.h> #include <libgit2-glib/ggit-blob-output-stream.h> #include <libgit2-glib/ggit-checkout-options.h> +#include <libgit2-glib/ggit-note.h> G_BEGIN_DECLS @@ -387,6 +388,36 @@ GgitMergeOptions *merge_options, GError **error); +const gchar *ggit_repository_get_default_notes_ref (GgitRepository *repository, + GError **error); + +GgitOId *ggit_repository_create_note (GgitRepository *repository, + GgitSignature *author, + GgitSignature *committer, + const gchar *notes_ref, + GgitOId *id, + const gchar *note, + gboolean force, + GError **error); + +gboolean ggit_repository_remove_note (GgitRepository *repository, + const gchar *notes_ref, + GgitSignature *author, + GgitSignature *committer, + GgitOId *id, + GError **error); + +GgitNote *ggit_repository_read_note (GgitRepository *repository, + const gchar *notes_ref, + GgitOId *id, + GError **error); + +gboolean ggit_repository_note_foreach (GgitRepository *repository, + const gchar *notes_ref, + GgitNoteCallback callback, + gpointer user_data, + GError **error); + G_END_DECLS #endif /* __GGIT_REPOSITORY_H__ */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libgit2-glib-0.0.22/libgit2-glib/ggit-types.h new/libgit2-glib-0.0.24/libgit2-glib/ggit-types.h --- old/libgit2-glib-0.0.22/libgit2-glib/ggit-types.h 2014-09-15 20:16:26.000000000 +0200 +++ new/libgit2-glib-0.0.24/libgit2-glib/ggit-types.h 2014-10-19 11:55:09.000000000 +0200 @@ -243,6 +243,13 @@ typedef struct _GgitNative GgitNative; /** + * GgitNote: + * + * Represents a note object. + */ +typedef struct _GgitNote GgitNote; + +/** * GgitObject: * * Represents a generic object in a repository. @@ -1185,6 +1192,21 @@ gpointer user_data); /** + * GgitNoteCallback: + * @blob_id: id of the blob containing the message. + * @annotated_object_id: id of the git object being annotated. + * @user_data: (closure): user-suplied data. + * + * When iterating over all the notes, callback that will be + * issued per note. See ggit_repository_note_foreach(). + * + * Returns: 0 to go continue or a #GgitError in case there was an error. + */ +typedef gint (* GgitNoteCallback) (GgitOId *blob_id, + GgitOId *annotated_object_id, + gpointer user_data); + +/** * GgitReferencesNameCallback: * @name: the name of the reference * @user_data: (closure): user-supplied data. @@ -1232,7 +1254,7 @@ typedef gint (* GgitStashCallback) (gsize index, const gchar *message, GgitOId *stash_oid, - gpointer *user_data); + gpointer user_data); /** * GgitStatusCallback: @@ -1277,7 +1299,7 @@ */ typedef gint (* GgitTagCallback) (const gchar *name, GgitOId *tag_oid, - gpointer *user_data); + gpointer user_data); /** * GgitTransferProgressCallback: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libgit2-glib-0.0.22/missing new/libgit2-glib-0.0.24/missing --- old/libgit2-glib-0.0.22/missing 2014-09-15 20:27:49.000000000 +0200 +++ new/libgit2-glib-0.0.24/missing 2014-11-04 17:01:09.000000000 +0100 @@ -1,7 +1,7 @@ #! /bin/sh # Common wrapper for a few potentially missing GNU programs. -scriptversion=2012-06-26.16; # UTC +scriptversion=2013-10-28.13; # UTC # Copyright (C) 1996-2013 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard <[email protected]>, 1996. @@ -160,7 +160,7 @@ ;; autom4te*) echo "You might have modified some maintainer files that require" - echo "the 'automa4te' program to be rebuilt." + echo "the 'autom4te' program to be rebuilt." program_details 'autom4te' ;; bison*|yacc*) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libgit2-glib-0.0.22/test-driver new/libgit2-glib-0.0.24/test-driver --- old/libgit2-glib-0.0.22/test-driver 2014-09-15 20:27:49.000000000 +0200 +++ new/libgit2-glib-0.0.24/test-driver 2014-11-04 17:01:09.000000000 +0100 @@ -1,7 +1,7 @@ #! /bin/sh # test-driver - basic testsuite driver script. -scriptversion=2012-06-27.10; # UTC +scriptversion=2013-07-13.22; # UTC # Copyright (C) 2011-2013 Free Software Foundation, Inc. # @@ -44,13 +44,12 @@ Usage: test-driver --test-name=NAME --log-file=PATH --trs-file=PATH [--expect-failure={yes|no}] [--color-tests={yes|no}] - [--enable-hard-errors={yes|no}] [--] TEST-SCRIPT + [--enable-hard-errors={yes|no}] [--] + TEST-SCRIPT [TEST-SCRIPT-ARGUMENTS] The '--test-name', '--log-file' and '--trs-file' options are mandatory. END } -# TODO: better error handling in option parsing (in particular, ensure -# TODO: $log_file, $trs_file and $test_name are defined). test_name= # Used for reporting. log_file= # Where to save the output of the test script. trs_file= # Where to save the metadata of the test run. @@ -69,10 +68,23 @@ --enable-hard-errors) enable_hard_errors=$2; shift;; --) shift; break;; -*) usage_error "invalid option: '$1'";; + *) break;; esac shift done +missing_opts= +test x"$test_name" = x && missing_opts="$missing_opts --test-name" +test x"$log_file" = x && missing_opts="$missing_opts --log-file" +test x"$trs_file" = x && missing_opts="$missing_opts --trs-file" +if test x"$missing_opts" != x; then + usage_error "the following mandatory options are missing:$missing_opts" +fi + +if test $# -eq 0; then + usage_error "missing argument" +fi + if test $color_tests = yes; then # Keep this in sync with 'lib/am/check.am:$(am__tty_colors)'. red='[0;31m' # Red. -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
