X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=dgit;h=bb771cc2b65525d3292d20440c43afb55d138730;hb=6e669d14aaea21dc23fcd25a94263d76fb520667;hp=b3f059e6ac8a1aa8fbee7ba85f2e6751334aa2c8;hpb=cac2a3e216e76975d60082edcb65f71abe0f1e00;p=dgit.git

diff --git a/dgit b/dgit
index b3f059e6..bb771cc2 100755
--- a/dgit
+++ b/dgit
@@ -47,12 +47,12 @@ our (@dput) = qw(dput);
 our (@debsign) = qw(debsign);
 our $keyid;
 
-our %opts_opt_map = ('dg' => \@dget,
-		     'dp' => \@dput,
-		     'ds' => \@debsign);
+our %opts_opt_map = ('dget' => \@dget,
+		     'dput' => \@dput,
+		     'debsign' => \@debsign);
 
 our $remotename = 'dgit';
-our $ourdscfield = 'Vcs-git-master';
+our $ourdscfield = 'Vcs-Git-Master';
 our $branchprefix = 'dgit';
 
 sub uploadbranch () { return "$branchprefix/$suite"; }
@@ -134,17 +134,32 @@ sub parsechangelog {
     return $c;
 }
 
-sub get_archive_dsc () {
-    my $rmad = cmdoutput qw(rmadison -asource),"-s$suite",$package;
+our $rmad;
+
+sub askmadison () {
+    $rmad ||= cmdoutput qw(rmadison -asource),"-s$suite",$package;
     $rmad =~ m/^ \s*( [^ \t|]+ )\s* \|
                  \s*( [^ \t|]+ )\s* \|
                  \s*( [^ \t|]+ )\s* \|
                  \s*( [^ \t|]+ )\s* /x or die "$rmad $?";
     $1 eq $package or die "$rmad $package ?";
     my $vsn = $2;
-    $3 eq $suite or die "$rmad $suite ?";
+    if ($suite ne $3) {
+	# madison canonicalises for us
+	print "canonical suite name for $suite is $3\n";
+	$suite = $3;
+    }
     $4 eq 'source' or die "$rmad ?";
-    # fixme it does not show us the component ?
+    return $vsn;
+}
+
+sub canonicalise_suite () {
+    askmadison();
+}
+
+sub get_archive_dsc () {
+    my $vsn = askmadison();
+    # fixme madison does not show us the component
     my $prefix = substr($package, 0, $package =~ m/^l/ ? 4 : 1);
     $dscurl = "$mirror/pool/main/$prefix/$package/${package}_$vsn.dsc";
 #print DEBUG Dumper($pdodata, $&, $dscurl);
@@ -162,7 +177,7 @@ sub check_for_git () {
     # returns 0 or 1
     my $cmd= 
 	"ssh $alioth_sshtestbodge->[0] '".
-	" set -e; cd $aliothpath;".
+	" set -e; cd $alioth_sshtestbodge->[1];".
 	" if test -d $package.git; then echo 1; else echo 0; fi".
 	"'";
     #print DEBUG "$cmd\n";
@@ -305,7 +320,7 @@ sub ensure_we_have_orig () {
 }
 
 sub rev_parse ($) {
-    return cmdoutput @git, qw(rev-parse --), "$_[0]~0";
+    return cmdoutput @git, qw(rev-parse), "$_[0]~0";
 }
 
 sub is_fast_fwd ($$) {
@@ -323,6 +338,7 @@ sub fetch_from_archive () {
     die $! if $!;
     die $? unless ($?==0 && chomp $upload_hash) 
 	or ($?==256 && !length $upload_hash);
+    $upload_hash ||= '';
     my $hash;
     if (defined $dsc_hash) {
 	die "missing git history even though dsc has hash"
@@ -424,22 +440,32 @@ sub dopush () {
     rename "../$dscfn.tmp","../$dscfn" or die "$dscfn $!";
     if (!$changesfile) {
 	my $pat = "../${package}_$clogp->{Version}_*.changes";
-	my @cs = <$pat>;
+	my @cs = glob $pat;
         die "$pat ?" unless @cs==1;
-	($changesfile) = $cs;
+	($changesfile) = @cs;
+    }
+    my $tag = debiantag($dsc->{Version});
+    if (!check_for_git()) {
+	runcmd_ordryrun qw(ssh),$alioth_sshtestbodge->[0],
+	"set -e; cd $alioth_sshtestbodge->[1];".
+	    " mkdir -p $package.git;".
+	    " cd $package.git;".
+	    " if ! test -d objects; then git init --bare; fi";
     }
+    runcmd_ordryrun @git, qw(push),$remotename,"HEAD:".lref(uploadbranch());
     if ($sign) {
-	my @tag_cmd = @git, qw(tag -s -m),
-	    "Release $dsc->{Version} for $suite [dgit]";
+	my @tag_cmd = (@git, qw(tag -s -m),
+		       "Release $dsc->{Version} for $suite [dgit]");
 	push @tag_cmd, qw(-u),$keyid if defined $keyid;
+	push @tag_cmd, $tag;
 	runcmd_ordryrun @tag_cmd;
 	my @debsign_cmd = @debsign;
 	push @debsign_cmd, "-k$keyid" if defined $keyid;
-	push @debsign_cmd, "../$changesfile";
-	runcmd_ordryrun qw(debsign);
+	push @debsign_cmd, $changesfile;
+	runcmd_ordryrun @debsign_cmd;
     }
-    runcmd_ordryrun @git, qw(push),$remotename,"HEAD:".lref(uploadbranch());
-    runcmd_ordryrun @dput, "../$dscfn";
+    runcmd_ordryrun @git, qw(push),$remotename,"refs/tags/$tag";
+    runcmd_ordryrun @dput, $changesfile;
 }
 
 sub cmd_clone {
@@ -454,7 +480,7 @@ sub cmd_clone {
 }
 
 sub branchsuite () {
-    my $branch = cmdoutput_errok @git, qw(symbolic-ref);
+    my $branch = cmdoutput_errok @git, qw(symbolic-ref HEAD);
     chomp $branch;
     if ($branch =~ m#^refs/heads/$branchprefix/([^/.]+)$#o) {
 	return $1;
@@ -469,9 +495,11 @@ sub fetchpullargs () {
     if (@ARGV==0) {
 	$suite = branchsuite();
 	$suite ||= $clogp->{Distribution};
+	canonicalise_suite();
 	print "fetching from suite $suite\n";
     } elsif (@ARGV==1) {
 	($suite) = @ARGV;
+	canonicalise_suite();
     } else {
 	die;
     }
@@ -492,6 +520,7 @@ sub cmd_push {
     $package = $clogp->{Source};
     if (@ARGV==0) {
 	$suite = $clogp->{Distribution};
+	canonicalise_suite();
     } else {
 	die;
     }
@@ -501,22 +530,29 @@ sub cmd_push {
 sub cmd_build {
     my $clogp = parsechangelog();
     $suite = $clogp->{Distribution};
-    runcmd_dryrun
+    $package = $clogp->{Source};
+    canonicalise_suite();
+    runcmd_ordryrun
 	qw(git-buildpackage -us -uc --git-no-sign-tags),
-        "--git-debian-branch=".uploadbranch(),
-        @ARGV;
+            "--git-debian-branch=".uploadbranch(),
+            @ARGV;
 }
 
 sub parseopts () {
+    my $om;
     while (@ARGV) {
-	last unless $ARGV[0];
+	last unless $ARGV[0] =~ m/^-/;
 	$_ = shift @ARGV;
 	last if m/^--?$/;
 	if (m/^--/) {
-	    if (m/^--dry-run/) {
+	    if (m/^--dry-run$/) {
 		$dryrun=1;
-	    if (m/^--no-sign/) {
+	    } elsif (m/^--no-sign$/) {
 		$sign=0;
+	    } elsif (m/^--(\w+)=(.*)/s && ($om = $opts_opt_map{$1})) {
+		$om->[0] = $2;
+	    } elsif (m/^--(\w+):(.*)/s && ($om = $opts_opt_map{$1})) {
+		push @$om, $2;
 	    } else {
 		die "$_ ?";
 	    }
@@ -524,22 +560,12 @@ sub parseopts () {
 	    while (m/^-./s) {
 		if (s/^-n/-/) {
 		    $dryrun=1;
-		} elsif (s/^-p(.*)//s) {
-		    $gpg[0] = $1;
 		} elsif (s/^-c(.*=.*)//s) {
 		    push @git, $1;
 		} elsif (s/^-C(.*)//s) {
 		    $changesfile = $1;
 		} elsif (s/^-k(.*)//s) {
 		    $keyid=$1;
-		} elsif (s/^-:(\w+)(.*)//s) {
-		    my $om = $opts_opt_map{$1};
-		    die "$1" unless defined $om;
-		    $om->[0] = $1;
-		} elsif (s/^-,(\w+)(.*)//s) {
-		    my $om = $opts_opt_map{$1};
-		    die "$1" unless defined $om;
-		    push @$om, $1;
 		} else {
 		    die "$_ ?";
 		}