Login | Register
My pages Projects Community openCollabNet

Discussions > commits > svn commit: r1580 - trunk: . fsvs fsvs/src fsvs/tests

fsvs
Discussion topic

Back to topic list

svn commit: r1580 - trunk: . fsvs fsvs/src fsvs/tests

Author pmarek
Full name P.Marek
Date 2008-04-02 22:27:38 PDT
Message Author: pmarek
Date: 2008-04-02 22:27:38-0700
New Revision: 1580

Modified:
   trunk/ (props changed)
   trunk/fsvs/CHANGES
   trunk/fsvs/src/fsvs.c
   trunk/fsvs/src/interface.h
   trunk/fsvs/src/warnings.c
   trunk/fsvs/tests/048_warnings

Log:
Remove FSVS_WARNINGS


Modified: trunk/fsvs/CHANGES
Url: http://fsvs.tigris.o​rg/source/browse/fsv​s/trunk/fsvs/CHANGES​?view=diff&rev=1​580&p1=trunk/fsv​s/CHANGES&p2=tru​nk/fsvs/CHANGES&​r1=1579&r2=1580
====================​====================​====================​==================
--- trunk/fsvs/CHANGES (original)
+++ trunk/fsvs/CHANGES 2008-04-02 22:27:38-0700
@@ -1,3 +1,6 @@
+Changes since 1.1.14
+- FSVS_WARNINGS removed. Use FSVS_WARNING.
+
 Changes since 1.1.13
 - New option for conflict handling; allows "stop" (historical default),
     "local", "remote", "both" or "merge".

Modified: trunk/fsvs/src/fsvs.c
Url: http://fsvs.tigris.o​rg/source/browse/fsv​s/trunk/fsvs/src/fsv​s.c?view=diff&re​v=1580&p1=trunk/​fsvs/src/fsvs.c&​p2=trunk/fsvs/src/fs​vs.c&r1=1579​&r2=1580
====================​====================​====================​==================
--- trunk/fsvs/src/fsvs.c (original)
+++ trunk/fsvs/src/fsvs.c 2008-04-02 22:27:38-0700
@@ -1017,7 +1017,6 @@
     STOPIF( opt__load_env(environ), NULL);
     STOPIF( waa__save_cwd(&start_path, &start_path_len, 0), NULL);
 
- STOPIF( wa__init(), NULL);
 
   if (!isatty(STDOUT_FILENO))
     opt__set_int( OPT__STATUS_COLOR, PRIO_PRE_CMDLINE, 0);

Modified: trunk/fsvs/src/interface.h
Url: http://fsvs.tigris.o​rg/source/browse/fsv​s/trunk/fsvs/src/int​erface.h?view=diff​&rev=1580&p1=t​runk/fsvs/src/interf​ace.h&p2=trunk/f​svs/src/interface.h​&r1=1579&r2=1​580
====================​====================​====================​==================
--- trunk/fsvs/src/interface.h (original)
+++ trunk/fsvs/src/interface.h 2008-04-02 22:27:38-0700
@@ -31,16 +31,6 @@
  * (default /etc/fsvs). */
 #define CONF__PATH_ENV "FSVS_CONF"
 
-/** The environment variable to set warning defaults.
- * Contains a list of specifications just like used after \c -W, separated
- * by one of \c ",;\\r\\n\\t".
- * Example:
- * \code
- * export FSVS_WARNINGS=chmod-​eperm=ignore
- * \endcode
- * */
-#define WARNINGS_ENV "FSVS_WARNINGS"
-
 /** If this variable has a numeric value other than 0, the debuglevel is
  * set even before commandline parsing. */
 #define FSVS_DEBUG_ENV "FSVS_DEBUGLEVEL"

Modified: trunk/fsvs/src/warnings.c
Url: http://fsvs.tigris.o​rg/source/browse/fsv​s/trunk/fsvs/src/war​nings.c?view=diff​&rev=1580&p1=tr​unk/fsvs/src/warning​s.c&p2=trunk/fsv​s/src/warnings.c​&r1=1579&r2=1580​
====================​====================​====================​==================
--- trunk/fsvs/src/warnings.c (original)
+++ trunk/fsvs/src/warnings.c 2008-04-02 22:27:38-0700
@@ -92,27 +92,6 @@
 }
 
 
-/** -.
- *
- * \todo Deprecate, as FSVS_WARNING is allowed?
- * */
-int wa__init(void)
-{
- int status;
- char *warn;
-
- status=0;
- warn=getenv(WARNINGS_ENV);
-
- if (warn)
- STOPIF( wa__split_process(warn, PRIO_ENV),
- "From environment variable %s", WARNINGS_ENV);
-
-ex:
- return status;
-}
-
-
 /**
  * -.
  * The given string is of the format \c warning=action.

Modified: trunk/fsvs/tests/048_warnings
Url: http://fsvs.tigris.o​rg/source/browse/fsv​s/trunk/fsvs/tests/0​48_warnings?view=dif​f&rev=1580&p​1=trunk/fsvs/tests/0​48_warnings&p2=t​runk/fsvs/tests/048_​warnings&r1=1579​&r2=1580
====================​====================​====================​==================
--- trunk/fsvs/tests/048_warnings (original)
+++ trunk/fsvs/tests/048_warnings 2008-04-02 22:27:38-0700
@@ -33,14 +33,6 @@
 fi
 
 
-if FSVS_WARNINGS="meta-user=ignore unknown-warning=ignore" $BINdflt st > $logfile 2>&1
-then
- $ERROR "FSVS_WARNINGS not used?"
-else
- $SUCCESS "FSVS_WARNINGS seems to be used"
-fi
-
-
 if [[ 1$opt_DEBUG == 11 ]]
 then
     # We need a sub-shell, as we expect an error returned and have to remove
@@ -83,15 +75,6 @@
         $ERROR "FSVS_WARNING not parsed?"
     fi
 
- FSVS_WARNINGS=_test-​warning=once $BINdflt st > $logfile 2>&1
- el=$?
- if [[ $el -eq 0 && `grep test-warning $logfile` ]]
- then
- $SUCCESS "FSVS_WARNINGS used"
- else
- $ERROR "FSVS_WARNINGS not parsed?"
- fi
-
     # Check whether the config file is respected
     echo 'warning=_test-warning=stop' > $FSVS_CONF/config
     if $BINdflt -d st > $logfile 2>&1

« Previous message in topic | 1 of 1 | Next message in topic »

Messages

Show all messages in topic

svn commit: r1580 - trunk: . fsvs fsvs/src fsvs/tests pmarek P.Marek 2008-04-02 22:27:38 PDT
Messages per page: