svn commit: r1714175 - in /subversion/branches/move-tracking-2/tools/dev/svnmover: merge3.c svnmover.c util.c

[ju...@apache.org]

Author: julianfoad
Date: Fri Nov 13 10:09:57 2015
New Revision: 1714175

URL: http://svn.apache.org/viewvc?rev=1714175&view=rev
Log:
On the 'move-tracking-2' branch: Try again to fix the Windows build.

* tools/dev/svnmover/merge3.c
  (brief_eid_and_name_or_nil): Remove erroneous unreachable code, found by
    Windows buildbot.

* tools/dev/svnmover/svnmover.c
  (linenoise_completion,
   sub_main): Enable linenoise completion only if HAVE_LINENOISE is defined.

* tools/dev/svnmover/util.c
  (svnmover_prompt_user): Fall back to normal prompting if HAVE_LINENOISE is
    not defined.

Modified:
    subversion/branches/move-tracking-2/tools/dev/svnmover/merge3.c
    subversion/branches/move-tracking-2/tools/dev/svnmover/svnmover.c
    subversion/branches/move-tracking-2/tools/dev/svnmover/util.c

Modified: subversion/branches/move-tracking-2/tools/dev/svnmover/merge3.c
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/tools/dev/svnmover/merge3.c?rev=1714175&r1=1714174&r2=1714175&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/tools/dev/svnmover/merge3.c (original)
+++ subversion/branches/move-tracking-2/tools/dev/svnmover/merge3.c Fri Nov 13 10:09:57 2015
@@ -87,8 +87,6 @@ brief_eid_and_name_or_nil(svn_element__c
 {
   return e ? apr_psprintf(result_pool, "%d/%s", e->parent_eid, e->name)
            : "<nil>";
-
-  return SVN_NO_ERROR;
 }
 
 /* Options to control how strict the merge is about detecting conflicts.

Modified: subversion/branches/move-tracking-2/tools/dev/svnmover/svnmover.c
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/tools/dev/svnmover/svnmover.c?rev=1714175&r1=1714174&r2=1714175&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/tools/dev/svnmover/svnmover.c (original)
+++ subversion/branches/move-tracking-2/tools/dev/svnmover/svnmover.c Fri Nov 13 10:09:57 2015
@@ -3476,6 +3476,7 @@ parse_actions(apr_array_header_t **actio
   return SVN_NO_ERROR;
 }
 
+#ifdef HAVE_LINENOISE
 /* A command-line completion callback for the 'Line Noise' interactive
  * prompting.
  *
@@ -3520,6 +3521,7 @@ linenoise_completion(const char *buf, li
         }
     }
 }
+#endif
 
 /* Display a prompt, read a line of input and split it into words.
  *
@@ -3889,7 +3891,9 @@ sub_main(int *exit_code, int argc, const
 
   if (interactive_actions)
     {
+#ifdef HAVE_LINENOISE
       linenoiseSetCompletionCallback(linenoise_completion);
+#endif
     }
 
   SVN_ERR(wc_create(&wc,

Modified: subversion/branches/move-tracking-2/tools/dev/svnmover/util.c
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/tools/dev/svnmover/util.c?rev=1714175&r1=1714174&r2=1714175&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/tools/dev/svnmover/util.c (original)
+++ subversion/branches/move-tracking-2/tools/dev/svnmover/util.c Fri Nov 13 10:09:57 2015
@@ -25,6 +25,8 @@
 
 #ifdef HAVE_LINENOISE
 #include "linenoise/linenoise.c"
+#else
+#include "svn_cmdline.h"
 #endif
 
 
@@ -33,6 +35,7 @@ svnmover_prompt_user(const char **result
                      const char *prompt_str,
                      apr_pool_t *pool)
 {
+#ifdef HAVE_LINENOISE
   char *input;
 
   input = linenoise(prompt_str);
@@ -47,6 +50,9 @@ svnmover_prompt_user(const char **result
     }
   *result = apr_pstrdup(pool, input);
   free(input);
+#else
+  SVN_ERR(svn_cmdline_prompt_user2(result, prompt_str, NULL, pool));
+#endif
   return SVN_NO_ERROR;
 }