our $sign = 1;
our $dryrun = 0;
+our $changesfile;
our $aliothname = 'iwj@git.debian.org';
-our $aliothpath = '/git/dgit-test';
+our $aliothpath = '/git/dgit-repos';
our $alioth_git = "git+ssh://$aliothname/$aliothpath";
our $alioth_sshtestbodge = [$aliothname,$aliothpath];
our (@git) = qw(git);
-our (@dget_opts);
-our (@git_tag_opts);
-our (@gpg) = qw(gpg);
+our (@dget) = qw(dget);
+our (@dput) = qw(dput);
+our (@debsign) = qw(debsign);
+our $keyid;
-our %opts_opt_map = ('d' => \@dget_opts,
- 't' => \@git_tag_opts,
- 'g' => \@gpg);
+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"; }
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);
# 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";
or $!==&ENOENT
or die "$f $!";
}
- runcmd qw(dget), @dget_opts, qw(--), $dscurl;
+ runcmd @dget, qw(--), $dscurl;
foreach my $f (grep { is_orig_file($_) } @files) {
link $f, "../../../../$f"
or $!==&EEXIST
$origurl .= "/$f";
die "$f ?" unless $f =~ m/^${package}_/;
die "$f ?" if $f =~ m#/#;
- runcmd_ordryrun qw(sh -ec),'cd ..; exec dget -- "$1"','x',$origurl;
+ runcmd_ordryrun qw(sh -ec),'cd ..; exec "$@"','x',
+ @dget,'--',$origurl;
}
}
sub rev_parse ($) {
- return cmdoutput @git, qw(rev-parse --), "$_[0]~0";
+ return cmdoutput @git, qw(rev-parse), "$_[0]~0";
}
sub is_fast_fwd ($$) {
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"
$dsc->{$ourdscfield} = rev_parse('HEAD');
$dsc->save("../$dscfn.tmp") or die $!;
rename "../$dscfn.tmp","../$dscfn" or die "$dscfn $!";
-fixme need to sign changes
- if ($sign) {
- runcmd_ordryrun @git, qw(tag -s),@git_tag_opts,qw(-m),
- "Release $dsc->{Version} for $suite [dgit]";
- my @sig_cmd = (@gpg, qw(--clearsign), "../$dscfn");
- if (!$dryrun) {
- unlink "../$dscfn.asc" or $!==&ENOENT or die "$dscfn.asc $!";
- runcmd @sig_cmd;
- rename "../$dscfn.asc","../$dscfn" or die "$dscfn $!";
- } else {
- dryrun_report @sig_cmd;
- }
+ if (!$changesfile) {
+ my $pat = "../${package}_$clogp->{Version}_*.changes";
+ my @cs = glob $pat;
+ die "$pat ?" unless @cs==1;
+ ($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());
- runcmd_ordryrun qw(dput),"../$dscfn";
+ if ($sign) {
+ 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 @debsign_cmd;
+ }
+ runcmd_ordryrun @git, qw(push),$remotename,"refs/tags/$tag";
+ runcmd_ordryrun @dput, $changesfile;
}
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;
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;
}
$package = $clogp->{Source};
if (@ARGV==0) {
$suite = $clogp->{Distribution};
+ canonicalise_suite();
} else {
die;
}
dopush();
}
+sub cmd_build {
+ my $clogp = parsechangelog();
+ $suite = $clogp->{Distribution};
+ $package = $clogp->{Source};
+ canonicalise_suite();
+ runcmd_ordryrun
+ qw(git-buildpackage -us -uc --git-no-sign-tags),
+ "--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 "$_ ?";
}
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) {
- push @git_tag_opts, '-u', $1;
- push @gpg, '-u', $1;
- } elsif (s/^-:([dtg])(.*)//s) {
- push @{ $opts_opt_map{$1} }, $_;
+ $keyid=$1;
} else {
die "$_ ?";
}
~ianmdlvl / dgit.git / blobdiff