On Tue, Aug 20, 2013 at 10:43:09PM -0000, breser_at_apache.org wrote:
> Author: breser
> Date: Tue Aug 20 22:43:08 2013
> New Revision: 1516004
>
> URL: http://svn.apache.org/r1516004
> Log:
> Merge r1502901 from trunk:
Wrong log message? It looks like r1511272 was merged.
>
> * r1502901
> Make ra_serf sessions reusable after a log callback uses the
> SVN_ERR_CEASE_INVOCATION error.
> Justification:
> Without this patch a new session would be required for each of these
> usages.
> Required by the r1468980 group.
> Notes:
> Resets the connection used by ra_serf to avoid having to read all data,
> which is mostly the same behavior as not re-using the ra session.
> Votes:
> +1: rhuijben, stefan2, breser
>
> Modified:
> subversion/branches/1.8.x/ (props changed)
> subversion/branches/1.8.x/STATUS
> subversion/branches/1.8.x/tools/server-side/svnauthz.c
>
> Propchange: subversion/branches/1.8.x/
> ------------------------------------------------------------------------------
> Merged /subversion/trunk:r1511272
>
> Modified: subversion/branches/1.8.x/STATUS
> URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/STATUS?rev=1516004&r1=1516003&r2=1516004&view=diff
> ==============================================================================
> --- subversion/branches/1.8.x/STATUS (original)
> +++ subversion/branches/1.8.x/STATUS Tue Aug 20 22:43:08 2013
> @@ -120,13 +120,6 @@ Veto-blocked changes:
> Approved changes:
> =================
>
> - * r1511272
> - svnauthz: improve help strings.
> - Justification:
> - I found the previous output confusing.
> - Votes:
> - +1: danielsh, stefan2, breser
> -
> * r1513874
> Fix packed revprop manifest growth in FSFS
> Justification:
>
> Modified: subversion/branches/1.8.x/tools/server-side/svnauthz.c
> URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/tools/server-side/svnauthz.c?rev=1516004&r1=1516003&r2=1516004&view=diff
> ==============================================================================
> --- subversion/branches/1.8.x/tools/server-side/svnauthz.c (original)
> +++ subversion/branches/1.8.x/tools/server-side/svnauthz.c Tue Aug 20 22:43:08 2013
> @@ -59,7 +59,9 @@ static const apr_getopt_option_t options
> {"repository", svnauthz__repos, 1, ("repository authz name")},
> {"transaction", 't', 1, ("transaction id")},
> {"is", svnauthz__is, 1,
> - ("instead of outputing, tests if the access is ARG\n"
> + ("instead of outputting, test if the access is\n"
> + " "
> + "exactly ARG\n"
> " "
> "ARG can be one of the following values:\n"
> " "
> @@ -67,10 +69,12 @@ static const apr_getopt_option_t options
> " "
> " r read-only access\n"
> " "
> - " no no access\n")
> + " no no access")
> },
> - {"groups-file", svnauthz__groups_file, 1, ("path to the global groups file")},
> - {"recursive", 'R', 0, ("recursive access to path")},
> + {"groups-file", svnauthz__groups_file, 1,
> + ("use the groups from file ARG")},
> + {"recursive", 'R', 0,
> + ("determine recursive access to PATH")},
> {0, 0, 0, 0}
> };
>
> @@ -129,27 +133,32 @@ static const svn_opt_subcommand_desc2_t
> {'t'} },
> {"accessof", subcommand_accessof, {0} /* no aliases */,
> ("Print or test the permissions set by an authz file.\n"
> - "usage: 1. svnauthz accessof [--username USER] [--groups-file GROUPS_FILE] TARGET\n"
> - " 2. svnauthz accessof [--username USER] [--groups-file GROUPS_FILE] \\\n"
> - " -t TXN REPOS_PATH FILE_PATH\n\n"
> - " 1. Prints the access of USER based on TARGET.\n"
> + "usage: 1. svnauthz accessof TARGET\n"
> + " 2. svnauthz accessof -t TXN REPOS_PATH FILE_PATH\n"
> + "\n"
> + " 1. Prints the access of USER to PATH based on authorization file at TARGET.\n"
> " TARGET can be a path to a file or an absolute file:// URL to an authz\n"
> - " file in a repository, but cannot be a repository relative URL (^/).\n\n"
> - " 2. Prints the access of USER based on authz file at FILE_PATH in the\n"
> - " transaction TXN in the repository at REPOS_PATH.\n\n"
> - " If the --username argument is omitted then access of an anonymous user\n"
> - " will be printed. If --path argument is omitted prints if any access\n"
> - " to the repo is allowed. If --groups-file is specified, the groups from\n"
> - " GROUPS_FILE will be used.\n\n"
> + " file in a repository, but cannot be a repository relative URL (^/).\n"
> + "\n"
> + " 2. Prints the access of USER to PATH based on authz file at FILE_PATH in the\n"
> + " transaction TXN in the repository at REPOS_PATH.\n"
> + "\n"
> + " USER is the argument to the --username option; if that option is not\n"
> + " provided, then access of an anonymous user will be printed or tested.\n"
> + "\n"
> + " PATH is the argument to the --path option; if that option is not provided,\n"
> + " the maximal access to any path in the repository will be considered.\n"
> + "\n"
> "Outputs one of the following:\n"
> " rw write access (which also implies read)\n"
> " r read access\n"
> - " no no access\n\n"
> + " no no access\n"
> + "\n"
> "Returns:\n"
> - " 0 when syntax is OK and --is argument (if any) matches.\n"
> + " 0 when syntax is OK and '--is' argument (if any) matches.\n"
> " 1 when syntax is invalid.\n"
> " 2 operational error\n"
> - " 3 when --is argument doesn't match\n"
> + " 3 when '--is' argument doesn't match\n"
> ),
> {'t', svnauthz__username, svnauthz__path, svnauthz__repos, svnauthz__is,
> svnauthz__groups_file, 'R'} },
>
Received on 2013-08-21 08:51:28 CEST