Re: svn commit: r1417252 - /subversion/trunk/subversion/libsvn_client/export.c

[Hyrum Wright <hw...@apache.org>]

On Tue, Dec 4, 2012 at 7:49 PM, <hw...@apache.org> wrote:

> Author: hwright
> Date: Wed Dec  5 00:49:22 2012
> New Revision: 1417252
>
> URL: http://svn.apache.org/viewvc?rev=1417252&view=rev
> Log:
> Manually migrate the Ev2 export implementation (in the case of recursive
> directory exports) from the ev2-export branch to trunk, guarded by the
> --enable-ev2-impl configure flag.
>
> * subversion/libsvn_client/export.c
>   (fetch_kind_func): Remove.
>   (get_editor): Rename to...
>   (get_editor_ev1): ...this.
>   (add_file_ev2, add_directory_ev2, target_revision_func, get_editor_ev2):
> New.
>   (svn_client_export5): Optionally use the Ev2 implementation for directory
>     exports.
>
> Modified:
>     subversion/trunk/subversion/libsvn_client/export.c
>
> Modified: subversion/trunk/subversion/libsvn_client/export.c
> URL:
> http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/export.c?rev=1417252&r1=1417251&r2=1417252&view=diff
>
> ==============================================================================
> --- subversion/trunk/subversion/libsvn_client/export.c (original)
> +++ subversion/trunk/subversion/libsvn_client/export.c Wed Dec  5 00:49:22
> 2012
> @@ -43,8 +43,13 @@
>
>  #include "svn_private_config.h"
>  #include "private/svn_subr_private.h"
> +#include "private/svn_delta_private.h"
>  #include "private/svn_wc_private.h"
>
> +#ifndef ENABLE_EV2_IMPL
> +#define ENABLE_EV2_IMPL 0
> +#endif
>

For the record, I'm not really happy with this little kludge, but it's the
best I could come up with to get both versions of the editor compiling, but
have the runtime choice made at configure-time.  If folks have other
suggestions, I'd appreciate them.

...

-Hyrum