subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From g..@apache.org
Subject svn commit: r1488813 - in /subversion/branches/invoke-diff-cmd-feature/subversion: include/svn_error_codes.h libsvn_client/diff.c
Date Mon, 03 Jun 2013 00:02:47 GMT
Author: gbg
Date: Mon Jun  3 00:02:46 2013
New Revision: 1488813

URL: http://svn.apache.org/r1488813
Log:
On the invoke-diff-cmd branch: Raise an error if both diff_cmd and
invoke-diff-cmd are set.

* subversion/include/svn_error_codes.h

  (SVN_CLIENT_DIFF_CMD): New macro.

* subversion/libsvn_client/diff.c 

  (diff_content_changed): Raise an error if both diff_cmd and
    invoke-diff-cmd are set.

Modified:
    subversion/branches/invoke-diff-cmd-feature/subversion/include/svn_error_codes.h
    subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_client/diff.c

Modified: subversion/branches/invoke-diff-cmd-feature/subversion/include/svn_error_codes.h
URL: http://svn.apache.org/viewvc/subversion/branches/invoke-diff-cmd-feature/subversion/include/svn_error_codes.h?rev=1488813&r1=1488812&r2=1488813&view=diff
==============================================================================
--- subversion/branches/invoke-diff-cmd-feature/subversion/include/svn_error_codes.h (original)
+++ subversion/branches/invoke-diff-cmd-feature/subversion/include/svn_error_codes.h Mon Jun
 3 00:02:46 2013
@@ -1149,6 +1149,11 @@ SVN_ERROR_START
              SVN_ERR_CLIENT_CATEGORY_START + 23,
              "The operation is forbidden by the server")
 
+  /** @since New in 1.9 */
+  SVN_ERRDEF(SVN_ERR_CLIENT_DIFF_CMD,
+             SVN_ERR_CLIENT_CATEGORY_START + 24,
+             "More than one diff command defined")
+
   /* misc errors */
 
   SVN_ERRDEF(SVN_ERR_BASE,

Modified: subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_client/diff.c
URL: http://svn.apache.org/viewvc/subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_client/diff.c?rev=1488813&r1=1488812&r2=1488813&view=diff
==============================================================================
--- subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_client/diff.c (original)
+++ subversion/branches/invoke-diff-cmd-feature/subversion/libsvn_client/diff.c Mon Jun  3
00:02:46 2013
@@ -789,6 +789,10 @@ diff_content_changed(svn_boolean_t *wrot
       return SVN_NO_ERROR;
     }
 
+  if (diff_cmd_baton->diff_cmd && diff_cmd_baton->invoke_diff_cmd)
+      return svn_error_create(SVN_ERR_CLIENT_DIFF_CMD, NULL,
+                              _("diff-cmd and invoke-diff-cmd are"
+                                "mutually exclusive."));
 
   if (diff_cmd_baton->diff_cmd || diff_cmd_baton->invoke_diff_cmd)
     {



Mime
View raw message