our $suite = 'sid';
our $package;
+our $sign = 1;
+our $nopush = 0;
+
our $aliothname = 'iwj@git.debian.org';
our $aliothpath = '/git/dgit-test';
our $alioth_git = "git+ssh://$aliothname/$aliothpath";
our $alioth_sshtestbodge = [$aliothname,$aliothpath];
our (@dget_opts) = qw(-u);
+our (@git_tag_opts);
+our (@gpg_opts);
our $remotename = 'dgit';
+our $ourdscfield = 'Vcs-git-master';
-sub mainbranch () { return "dgit/$suite"; }
-sub uploadbranch () { return "dgit/$suite.upload"; }
+sub uploadbranch () { return "dgit/$suite"; }
sub lref ($) { return "refs/heads/$_[0]"; }
sub rref ($) { return "refs/remotes/$remotename/$_[0]"; }
+sub debiantag ($) { return "debian/$_[0]"; }
our $ua;
sub parsechangelog {
my $c = Dpkg::Control::Hash->new();
- my $p = new IO::File '-|', qw(dpkg-parsechangelog) or die $!;
+ my $p = new IO::Handle;
+ open $p, '-|', qw(dpkg-parsechangelog) or die $!;
$c->parse($p);
$?=0; $!=0; close $p or die "$! $?";
return $c;
return ($tree,$dir);
}
+sub dsc_files () {
+ map {
+ m/^\w+ \d+ (\S+)$/ or die "$_ ?";
+ $1;
+ } grep m/\S/, split /\n/, ($dsc->{'Checksums-Sha256'} || $dsc->{Files});
+}
+
+sub is_orig_file ($) {
+ local ($_) = @_;
+ m/\.orig\.tar\.\w+$/;
+}
+
sub generate_commit_from_dsc () {
prep_ud();
chdir $ud or die $!;
my @files;
- foreach (split /\n/, ($dsc->{'Checksums-Sha256'} || $dsc->{Files})) {
- next unless m/\S/;
- m/^\w+ \d+ (\S+)$/ or die "$_ ?";
- my $f = $1;
+ foreach my $f (dsc_files()) {
die if $f =~ m#/|^\.|\.dsc$|\.tmp$#;
push @files, $f;
link "../../../$f", $f
or die "$f $!";
}
runcmd qw(dget), @dget_opts, qw(--), $dscurl;
- foreach my $f (grep { m/\.tar\.gz$/ } @files) {
+ foreach my $f (grep { is_orig_file($_) } @files) {
link $f, "../../../$f"
or $!==&EEXIST
or die "$f $!";
return $outputhash;
}
+sub ensure_we_have_orig () {
+ foreach my $f (dsc_files()) {
+ next unless is_orig_file($f);
+ if (stat "../$f") {
+ die "$f ?" unless -f _;
+ } else {
+ die "$f $!" unless $!==&ENOENT;
+ }
+ my $origurl = $dscurl;
+ $origurl =~ s{/[^/]+$}{};
+ $origurl .= "/$f";
+ die "$f ?" unless $f =~ m/^${package}_/;
+ die "$f ?" if $f =~ m#/#;
+ runcmd qw(sh -ec),'cd ..; exec dget -- "$1"','x',$origurl;
+ }
+}
+
sub rev_parse ($) {
return cmdoutput qw(git rev-parse --), "$_[0]~0";
}
$!=0; $upload_hash = `git show-ref --heads $upload_ref`;
die $! if $!;
die $? unless ($?==0 && chomp $upload_hash)
- or ($?==128 && !length $upload_hash);
+ or ($?==256 && !length $upload_hash);
my $hash;
if (defined $dsc_hash) {
die "missing git history even though dsc has hash"
unless length $upload_hash;
$hash = $dsc_hash;
+ ensure_we_have_orig();
} else {
$hash = generate_commit_from_dsc();
}
sub clone () {
get_archive_dsc();
- $dsc_hash = $dsc->{'Vcs-git-master'};
+ $dsc_hash = $dsc->{$ourdscfield};
if (defined $dsc_hash) {
$dsc_hash =~ m/\w+/ or die "$dsc_hash $?";
$dsc_hash = $&;
chdir "$dstdir" or die "$dstdir $!";
runcmd qw(git init -q);
open H, "> .git/HEAD" or die $!;
- print H "ref: ".lref(mainbranch())."\n" or die $!;
+ print H "ref: ".lref(uploadbranch())."\n" or die $!;
close H or die $!;
runcmd qw(git remote add), $remotename, $alioth_git;
runcmd "git config branch.$suite.remote $remotename";
- runcmd "git config branch.$suite.merge ".lref(mainbranch());
+ runcmd "git config branch.$suite.merge ".lref(uploadbranch());
my $newhash = generate_commit_from_dsc();
runcmd qw(git reset --hard), $newhash;
}
sub pull () {
fetch();
- runcmd qw(git merge),lref(uploadbranch());
+ runcmd qw(git merge -m),"Merge from $suite [dgit]",lref(uploadbranch());
}
-sub push () {
+sub dopush () {
runcmd qw(git diff --quiet HEAD);
my $clogp = parsechangelog();
$package = $clogp->{Source};
my $tree = mktree_in_ud_from_only_subdir();
chdir '../../../..' or die $!;
runcmd qw(git diff --exit-code), $tree;
- runcmd qw(git fetch), $alioth_git,
- map { lref($_).":".rref($_) }
- (mainbranch(), uploadbranch());
- die <<END;
- if (!is_fast_fwd(mainbranch
-xxx introduce remote_lref
-xxx use remote_lref everywhere
-
-fetch from alioth
-do fast forward check and maybe fake merge
-push to uploading
-dput
-push to main
-END
+#fetch from alioth
+#do fast forward check and maybe fake merge
+# if (!is_fast_fwd(mainbranch
+# runcmd qw(git fetch -p ), $alioth_git,
+# map { lref($_).":".rref($_) }
+# (uploadbranch());
+ $dsc->{$ourdscfield} = rev_parse('HEAD');
+ $dsc->save("../$dscfn.tmp") or die $!;
+ rename "../$dscfn.tmp","../$dscfn" or die "$dscfn $!";
+ if ($sign) {
+ runcmd qw(git tag -s),@git_tag_opts,qw(-m),
+ "Release $dsc->{Version} for $suite [dgit]";
+ unlink "../$dscfn.asc" or $!==&ENOENT or die "$dscfn.asc $!";
+ runcmd qw(gpg --clearsign),@gpg_opts,"../$dscfn";
+ rename "../$dscfn.asc","../$dscfn" or die "$dscfn $!";
+ }
+ if (!$nopush) {
+ runcmd qw(git push),$remotename,"HEAD:".lref(uploadbranch());
+ runcmd qw(dput),"../$dscfn";
+ }
}
sub cmd_clone {
clone();
}
+sub branchsuite () {
+ my $branch = `git-symbolic-ref HEAD`;
+ if ($branch =~ m#^refs/heads/dgit/([^/.]+)$#) {
+ return $1;
+ } else {
+ return undef;
+ }
+}
+
+sub cmd_fetch {
+ my $clogp = parsechangelog();
+ $package = $clogp->{Source};
+ if (@ARGV==0) {
+ $suite = branchsuite();
+ $suite ||= $clogp->{Distribution};
+ print "fetching from suite $suite\n";
+ } elsif (@ARGV==1) {
+ ($suite) = @ARGV;
+ } else {
+ die;
+ }
+ fetch();
+}
+
+sub cmd_push {
+ my $clogp = parsechangelog();
+ $package = $clogp->{Source};
+ if (@ARGV==0) {
+ $suite = $clogp->{Distribution};
+ } else {
+ die;
+ }
+ dopush();
+}
+
sub parseopts () {
die if @ARGV && $ARGV[0] =~ m/^\-/;
}
~ianmdlvl / dgit.git / blobdiff