Changeset 1608

Timestamp:

Jul 14, 2020, 2:40:18 AM (3 years ago)

Author:

Peter Johansson

Message:

merge recent changes from 0.10-stable branch into trunk

Location:

trunk

Files:

• . (modified) (1 prop)
• .release_year (modified) (1 diff)
• lib/SVNproperty.cc (modified) (2 diffs)
• m4/version.m4 (modified) (1 prop)
• test/Makefile.am (modified) (1 diff)
• test/repo_status_test.sh (modified) (2 diffs)

trunk/.release_year

@@ -1 @@
-2015
+2020

trunk/lib/SVNproperty.cc

@@ -4 +4 @@
   Copyright (C) 2006 Jari Häkkinen
   Copyright (C) 2007, 2008 Jari Häkkinen, Peter Johansson
-  Copyright (C) 2010, 2011, 2012 Peter Johansson
+  Copyright (C) 2010, 2011, 2012, 2020 Peter Johansson
 
   This file is part of svndigest, http://dev.thep.lu.se/svndigest
@@ -98 +98 @@
       std::string first;
       getline(ss2, first, '-');
+      bool found_dash = word.size()>first.size() && word[first.size()]=='-';
       trim(first);
       std::string second;
-      bool found_dash = getline(ss2, second);
+      getline(ss2, second);
       trim(second);
       yat::utility::Segment<svn_revnum_t> rev_interval;

trunk/test/Makefile.am

@@ -83 +83 @@
 
 ## graph test needs to link against Graph class
-test_graph_test_LDADD = $(LDADD) lib/libsvndigest.a
+test_graph_test_LDADD = test/libsvndigesttest.a \
+  lib/libsvndigest.a lib/libsvndigest_core.a yat/libyat.a \
+  $(SVN_LIBS) $(APR_LIBS) $(PLPLOT_LIBS)
 
 test_libsvndigesttest_a_SOURCES = test/Suite.cc

trunk/test/repo_status_test.sh

@@ -35 +35 @@
 # check if the last test revision is a part of the svndigest repository
 status_return=`$SVN status -v ${repo}/db/revs/$rev`
+echo "status_return:$status_return"
 # logic: (file does not exist) || (file exists but not in revision control)
-if [[ ${#status_return} -eq 0 || ${status_return:0:1} = "?" ]]; then
+if test x"${status_return}" = x"" || echo "${status_return}" | $GREP -q '^?'; then
     repository_status=0
     echo "ERROR: test repository and svndigest repository are not synchronized:"
@@ -50 +51 @@
 # repository is found, or break the test repository revision 0 is
 # reached.
-while [[ ${#status_return} -eq 0 || ${status_return:0:1} = "?" ]] && [ $rev -ge 0 ]; do
+while {test x"${status_return}" = x"" || echo "${status_return}" | $GREP -q '^?'} && test $rev -ge 0; do
     echo "ERROR:    svn add test/repo/db/revs/$rev test/repo/db/revprops/$rev"
     let rev--