git-svn: fix dcommit to urls with embedded usernames
Don't rely on the extracted URL from working_head_info since that has the username removed. Instead use the $gs->full_url method (as before with ba24e74 (git-svn: add ability to specify --commit-url for dcommit, 2008-08-07)) to give us the URL to commit to if --commit-url is not specified. Aditionally, since we clean usernames from URLs, checking the URL after rebase can fail because it doesn't match the URL we used to commit; so unconditionally provide a username-free URL for checking the result of the refetch. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Eric Wong committed
Aug 20, 2008 at 00:30 UTC
711521e246ea7d7b9bb10a1607cdd0a6de6a9927
1 file changed
+5
-3
git-svn.perl
+5
-3
@@ -421,7 +421,7 @@ sub cmd_dcommit {
421
$head ||= 'HEAD';
422
my @refs;
423
my ($url, $rev, $uuid, $gs) = working_head_info($head, \@refs);
424
- $url = $_commit_url if defined $_commit_url;
424
+ $url = defined $_commit_url ? $_commit_url : $gs->full_url;
425
my $last_rev = $_revision if defined $_revision;
426
if ($url) {
427
print "Committing to $url ...\n";
@@ -437,6 +437,8 @@ sub cmd_dcommit {
437
"If these changes depend on each other, re-running ",
438
"without --no-rebase may be required."
439
}
440
+ my $expect_url = $url;
441
+ Git::SVN::remove_username($expect_url);
442
while (1) {
443
my $d = shift @$linear_refs or last;
444
unless (defined $last_rev) {
@@ -511,9 +513,9 @@ sub cmd_dcommit {
513
$gs->refname,
514
"\nBefore dcommitting";
515
}
514
- if ($url_ ne $url) {
516
+ if ($url_ ne $expect_url) {
517
fatal "URL mismatch after rebase: ",
516
- "$url_ != $url";
518
+ "$url_ != $expect_url";
519
}
520
if ($uuid_ ne $uuid) {
521
fatal "uuid mismatch after rebase: ",