Re: svn commit: r28788 - in branches/reintegrate: . subversion/svn

On Jan 8, 2008 11:18 AM, <kfogel_at_tigris.org> wrote:
> Author: kfogel
> Date: Tue Jan 8 08:18:48 2008
> New Revision: 28788
>
> Log:
> On the reintegrate branch: check for mutually exclusive options.
>
> * subversion/svn/main.c
> (main): Error if --reintegrate is used with --ignore-ancestry or with
> --record-only.
>
> * reintegrate-branch-TODO: Remove relevant item.
>
>
> Modified:
> branches/reintegrate/reintegrate-branch-TODO
> branches/reintegrate/subversion/svn/main.c
>
> Modified: branches/reintegrate/reintegrate-branch-TODO
> URL: http://svn.collab.net/viewvc/svn/branches/reintegrate/reintegrate-branch-TODO?pathrev=28788&r1=28787&r2=28788
> ==============================================================================
> --- branches/reintegrate/reintegrate-branch-TODO (original)
> +++ branches/reintegrate/reintegrate-branch-TODO Tue Jan 8 08:18:48 2008
> @@ -18,9 +18,6 @@
> Remaining work (which can be done post-merge)
> =============================================
>
> -* Fix UI constraints for 'merge --reintegrate', which is "incompatible"
> - with --ignore-ancestry and --record-only (dlr)
> -
> * Examine "TODO(reint)", including (but not limited to):
>
> * "Is this the same line?" direct ancestor check (glasser)
>
> Modified: branches/reintegrate/subversion/svn/main.c
> URL: http://svn.collab.net/viewvc/svn/branches/reintegrate/subversion/svn/main.c?pathrev=28788&r1=28787&r2=28788
> ==============================================================================
> --- branches/reintegrate/subversion/svn/main.c (original)
> +++ branches/reintegrate/subversion/svn/main.c Tue Jan 8 08:18:48 2008
> @@ -1526,9 +1526,6 @@
> }
> }
>
> - /* ### TODO(reint): when reintegrate is set, ignore_ancestry should
> - ### not be passed, because it is ignored. */
> -
> /* Check that the subcommand wasn't passed any inappropriate options. */
> for (i = 0; i < received_opts->nelts; i++)
> {
> @@ -1737,6 +1734,37 @@
> return svn_cmdline_handle_exit_error(err, pool, "svn: ");
> }
>
> + /* The --reintegrate option is mutually exclusive with both
> + --ignore-ancestry and --record-only. */
> + if (opt_state.reintegrate)
> + {
> + if (opt_state.ignore_ancestry)
> + {
> + if (opt_state.record_only)
> + {
> + err = svn_error_create(SVN_ERR_CL_MUTUALLY_EXCLUSIVE_ARGS, NULL,
> + _("--reintegrate is mutually exclusive "
> + "with both --ignore-ancestry "
> + "and --record-only"));

Bikeshedding, but I'd prefer "cannot be used with" or "cannot be
combined with" over "is mutually exclusive with".

--dave

> + return svn_cmdline_handle_exit_error(err, pool, "svn: ");
> + }
> + else
> + {
> + err = svn_error_create(SVN_ERR_CL_MUTUALLY_EXCLUSIVE_ARGS, NULL,
> + _("--reintegrate is mutually exclusive "
> + "with --ignore-ancestry"));
> + return svn_cmdline_handle_exit_error(err, pool, "svn: ");
> + }
> + }
> + else if (opt_state.record_only)
> + {
> + err = svn_error_create(SVN_ERR_CL_MUTUALLY_EXCLUSIVE_ARGS, NULL,
> + _("--reintegrate is mutually exclusive "
> + "with --record-only"));
> + return svn_cmdline_handle_exit_error(err, pool, "svn: ");
> + }
> + }
> +
> /* Update auto-props-enable option, and populate the MIME types map,
> for add/import commands */
> if (subcommand->cmd_func == svn_cl__add
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: svn-unsubscribe_at_subversion.tigris.org
> For additional commands, e-mail: svn-help_at_subversion.tigris.org
>
>

-- 
David Glasser | glasser@davidglasser.net | http://www.davidglasser.net/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org