Re: [PATCH] git-svn: read the dcommit url from the config file on a per remote basis
Peter Oberndorfer <kumbayo84@arcor.de> wrote:
Show 7 quoted lines
> The commit url for dcommit is determined in the following order:
> commandline option --commit-url
> svn.commiturl
> svn-remote.<name>.commiturl
> svn-remote.<name>.url
>
> Signed-off-by: Peter Oberndorfer <kumbayo84@arcor.de>
> ---
> Now with a short documentation for svn.commiturl.
> I hope the wording is OK.
Thanks Peter, the wording is fine.
Acked and pushed out to git://git.bogomips.org/git-svn
Show 44 quoted lines
> Documentation/git-svn.txt | 4 ++++
> git-svn.perl | 12 +++++++++++-
> 2 files changed, 15 insertions(+), 1 deletions(-)
>
> diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt
> index 3d45654..cda3389 100644
> --- a/Documentation/git-svn.txt
> +++ b/Documentation/git-svn.txt
> @@ -169,6 +169,10 @@ and have no uncommitted changes.
> reused if a user is later given access to an alternate transport
> method (e.g. `svn+ssh://` or `https://`) for commit.
>
> +config key: svn-remote.<name>.commiturl
> +
> +config key: svn.commiturl (overwrites all svn-remote.<name>.commiturl options)
> +
> Using this option for any other purpose (don't ask)
> is very strongly discouraged.
> --
> diff --git a/git-svn.perl b/git-svn.perl
> index cbc5211..be4d011 100755
> --- a/git-svn.perl
> +++ b/git-svn.perl
> @@ -438,7 +438,17 @@ sub cmd_dcommit {
> die "Unable to determine upstream SVN information from ",
> "$head history.\nPerhaps the repository is empty.";
> }
> - $url = defined $_commit_url ? $_commit_url : $gs->full_url;
> +
> + if (defined $_commit_url) {
> + $url = $_commit_url;
> + } else {
> + $url = eval { command_oneline('config', '--get',
> + "svn-remote.$gs->{repo_id}.commiturl") };
> + if (!$url) {
> + $url = $gs->full_url
> + }
> + }
> +
> my $last_rev = $_revision if defined $_revision;
> if ($url) {
> print "Committing to $url ...\n";
> --
> 1.6.1.3