our $suite = 'sid';
our $package;
+our $sign = 1;
+our $dryrun = 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) = qw(git);
+our (@dget_opts);
our (@git_tag_opts);
+our (@gpg) = qw(gpg);
+
+our %opts_opt_map = ('d' => \@dget_opts,
+ 't' => \@git_tag_opts,
+ 'g' => \@gpg);
our $remotename = 'dgit';
our $ourdscfield = 'Vcs-git-master';
+our $branchprefix = 'dgit';
-sub uploadbranch () { return "dgit/$suite"; }
+sub uploadbranch () { return "$branchprefix/$suite"; }
sub lref ($) { return "refs/heads/$_[0]"; }
sub rref ($) { return "refs/remotes/$remotename/$_[0]"; }
sub debiantag ($) { return "debian/$_[0]"; }
die "@_ $! $?" if system @_;
}
-sub cmdoutput {
+sub cmdoutput_errok {
open P, "-|", @_ or die $!;
my $d;
$!=0; $?=0;
{ local $/ = undef; $d = <P>; }
die if P->error;
- close P or die "@_ $? $!";
+ close P or return undef;
chomp $d;
return $d;
}
+sub cmdoutput {
+ my $d = cmdoutput_errok @_;
+ defined $d or die "@_ $? $!";
+ return $d;
+}
+
+sub dryrun_report {
+ print "#" or die $!;
+ local $_;
+ foreach my $a (@_) {
+ $_ = $a;
+ if (s{['\\]}{\\$&}g || m{\s} || m{[^-_./0-9a-z]}i) {
+ print " '$_'" or die $!;
+ } else {
+ print " $_" or die $!;
+ }
+ }
+ print "\n" or die $!;
+}
+
+sub runcmd_ordryrun {
+ if (!$dryrun) {
+ runcmd @_;
+ } else {
+ dryrun_report @_;
+ }
+}
+
sub parsecontrol {
my $c = Dpkg::Control::Hash->new();
$c->load(@_) or return undef;
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;
# returns 0 or 1
my $cmd=
"ssh $alioth_sshtestbodge->[0] '".
- " set -e; cd /git/dgit-test;".
+ " set -e; cd $aliothpath;".
" if test -d $package.git; then echo 1; else echo 0; fi".
"'";
#print DEBUG "$cmd\n";
runcmd qw(git init -q);
rmtree('.git/objects');
symlink '../../../../objects','.git/objects' or die $!;
- runcmd qw(git add -Af);
- my $tree = cmdoutput qw(git write-tree);
+ runcmd @git, qw(add -Af);
+ my $tree = cmdoutput @git, qw(write-tree);
chomp $tree; $tree =~ m/^\w+$/ or die "$tree ?";
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) {
- link $f, "../../../$f"
+ foreach my $f (grep { is_orig_file($_) } @files) {
+ link $f, "../../../../$f"
or $!==&EEXIST
or die "$f $!";
}
$authline =~ m/^[^<>]+ \<\S+\> \d+ [-+]\d+$/ or die $authline;
open C, ">../commit.tmp" or die $!;
print C "tree $tree\n" or die $!;
- print C "parent $upload_hash\n" or die $! if defined $upload_hash;
+ print C "parent $upload_hash\n" or die $! if $upload_hash;
print C <<END or die $!;
author $authline
committer $authline
END
close C or die $!;
print "synthesised git commit from .dsc $clogp->{Version}\n";
- my $commithash = cmdoutput qw(git hash-object -w -t commit ../commit.tmp);
+ my $commithash = cmdoutput @git, qw(hash-object -w -t commit ../commit.tmp);
chdir '../../../..' or die $!;
- cmdoutput qw(git update-ref -m),"dgit synthesise $clogp->{Version}",
+ cmdoutput @git, qw(update-ref -m),"dgit synthesise $clogp->{Version}",
'DGIT_ARCHIVE', $commithash;
- cmdoutput qw(git log -n2), $commithash;
+ cmdoutput @git, qw(log -n2), $commithash;
# ... gives git a chance to complain if our commit is malformed
my $outputhash = $commithash;
- if (defined $upload_hash) {
+ if ($upload_hash) {
chdir "$ud/$dir" or die $!;
- runcmd qw(git reset --hard), $upload_hash;
+ runcmd @git, qw(reset --hard), $upload_hash;
runcmd qw(sh -ec), 'dpkg-parsechangelog >>../changelogold.tmp';
my $oldclogp = Dpkg::Control::Hash->new();
$oldclogp->parse('../changelogold.tmp','previous changelog') or die;
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_ordryrun qw(sh -ec),'cd ..; exec dget -- "$1"','x',$origurl;
+ }
+}
+
sub rev_parse ($) {
- return cmdoutput qw(git rev-parse --), "$_[0]~0";
+ return cmdoutput @git, qw(rev-parse --), "$_[0]~0";
}
sub is_fast_fwd ($$) {
my ($ancestor,$child) = @_;
- my $mb = cmdoutput qw(git merge-base), $dsc_hash, $upload_hash;
+ my $mb = cmdoutput @git, qw(merge-base), $dsc_hash, $upload_hash;
return rev_parse($mb) eq rev_parse($ancestor);
}
# ensures that rref(uploadbranch()) is what is actually in the archive,
# one way or another
my $upload_ref = rref(uploadbranch());
- $!=0; $upload_hash = `git show-ref --heads $upload_ref`;
+ $!=0; $upload_hash =
+ cmdoutput_errok @git, qw(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;
+ unless $upload_hash;
$hash = $dsc_hash;
+ ensure_we_have_orig();
} else {
$hash = generate_commit_from_dsc();
}
- if (length $upload_hash) {
+ if ($upload_hash) {
die "not fast forward on last upload branch!".
" (archive's version left in DGIT_ARCHIVE)"
unless is_fast_fwd($dsc_hash, $upload_hash);
}
if ($upload_hash ne $hash) {
- cmdoutput qw(git update-ref -m), 'dgit fetch', $upload_ref, $hash;
+ my @upd_cmd = (@git, qw(update-ref -m), 'dgit fetch', $upload_ref, $hash);
+ if (!$dryrun) {
+ cmdoutput @upd_cmd;
+ } else {
+ dryrun_report @upd_cmd;
+ }
}
}
sub clone () {
+ die "dry run makes no sense with clone" if $dryrun;
get_archive_dsc();
$dsc_hash = $dsc->{$ourdscfield};
if (defined $dsc_hash) {
print "last upload to archive has NO git hash\n";
}
my $dstdir = "$package";
+ my $branch = uploadbranch();
if (check_for_git()) {
print "cloning existing git history\n";
- runcmd qw(git clone --origin),$remotename, qw(-b), $suite, '--',
- $alioth_git, $dstdir;
+ runcmd @git, qw(clone --origin),$remotename, qw(-b), $branch, '--',
+ "$alioth_git/$package.git", $dstdir;
chdir "$dstdir" or die "$dstdir $!";
fetch_from_archive();
- runcmd qw(git reset --hard), rref(uploadbranch());
+ runcmd @git, qw(reset --hard), rref(uploadbranch());
} else {
print "starting new git history\n";
mkdir $dstdir or die "$dstdir $!";
chdir "$dstdir" or die "$dstdir $!";
- runcmd qw(git init -q);
+ runcmd @git, qw(init -q);
open H, "> .git/HEAD" 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(uploadbranch());
+ runcmd @git, qw(remote add), $remotename, "$alioth_git/$package.git";
+ runcmd "git config branch.$branch.remote $remotename";
+ runcmd "git config branch.$branch.merge ".lref(uploadbranch());
my $newhash = generate_commit_from_dsc();
- runcmd qw(git reset --hard), $newhash;
+ runcmd @git, qw(reset --hard), $newhash;
}
print "ready for work in $dstdir\n";
}
sub fetch () {
+ get_archive_dsc();
if (check_for_git()) {
- runcmd qw(git fetch -p),$remotename,
+ runcmd_ordryrun @git, qw(fetch -p),$remotename,
'+refs/heads/*:refs/remotes/origin/*';
}
fetch_from_archive();
sub pull () {
fetch();
- runcmd qw(git merge -m),"Merge from $suite [dgit]",lref(uploadbranch());
+ runcmd_ordryrun @git, qw(merge -m),"Merge from $suite [dgit]",
+ lref(uploadbranch());
}
sub dopush () {
- runcmd qw(git diff --quiet HEAD);
+ runcmd @git, qw(diff --quiet HEAD);
my $clogp = parsechangelog();
$package = $clogp->{Source};
my $dscfn = "${package}_$clogp->{Version}.dsc";
- stat $dscfn or die "$dscfn $!";
+ stat "../$dscfn" or die "$dscfn $!";
$dsc = parsecontrol("../$dscfn");
prep_ud();
chdir $ud or die $!;
print "checking that $dscfn corresponds to HEAD\n";
runcmd qw(dpkg-source -x --), "../../../../$dscfn";
- my $tree = mktree_in_ud_from_only_subdir();
+ my ($tree,$dir) = mktree_in_ud_from_only_subdir();
chdir '../../../..' or die $!;
- runcmd qw(git diff --exit-code), $tree;
+ runcmd @git, qw(diff --exit-code), $tree;
#fetch from alioth
#do fast forward check and maybe fake merge
# if (!is_fast_fwd(mainbranch
-# runcmd qw(git fetch -p ), $alioth_git,
+# runcmd @git, qw(fetch -p ), "$alioth_git/$package.git",
# map { lref($_).":".rref($_) }
# (uploadbranch());
$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 qw(git tag -s),@git_tag_opts,qw(-m),
+ runcmd_ordryrun @git, qw(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";
+ 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;
+ }
}
+ runcmd_ordryrun @git, qw(push),$remotename,"HEAD:".lref(uploadbranch());
+ runcmd_ordryrun qw(dput),"../$dscfn";
}
sub cmd_clone {
}
sub branchsuite () {
- $branch = `git-symbolic-ref HEAD`;
- if ($branch =~ m#^refs/heads/dgit/([^/.]+)$#) {
+ my $branch = cmdoutput_errok @git, qw(symbolic-ref);
+ chomp $branch;
+ if ($branch =~ m#^refs/heads/$branchprefix/([^/.]+)$#o) {
return $1;
} else {
return undef;
}
}
-sub cmd_fetch {
+sub fetchpullargs () {
my $clogp = parsechangelog();
$package = $clogp->{Source};
if (@ARGV==0) {
} else {
die;
}
+}
+
+sub cmd_fetch {
+ fetchpullargs();
fetch();
}
+sub cmd_pull {
+ fetchpullargs();
+ pull();
+}
+
sub cmd_push {
my $clogp = parsechangelog();
$package = $clogp->{Source};
}
sub parseopts () {
- die if @ARGV && $ARGV[0] =~ m/^\-/;
+ while (@ARGV) {
+ last unless $ARGV[0];
+ $_ = shift @ARGV;
+ last if m/^--?$/;
+ if (m/^--/) {
+ if (m/^--dry-run/) {
+ $dryrun=1;
+ if (m/^--no-sign/) {
+ $sign=0;
+ } else {
+ die "$_ ?";
+ }
+ } else {
+ while (m/^-./s) {
+ if (s/^-n/-/) {
+ $dryrun=1;
+ } elsif (s/^-p(.*)//s) {
+ $gpg[0] = $1;
+ } elsif (s/^-c(.*=.*)//s) {
+ push @git, $1;
+ } elsif (s/^-k(.*)//s) {
+ push @git_tag_opts, '-u', $1;
+ push @gpg, '-u', $1;
+ } elsif (s/^-:([dtg])(.*)//s) {
+ push @{ $opts_opt_map{$1} }, $_;
+ } else {
+ die "$_ ?";
+ }
+ }
+ }
+ }
}
parseopts();
~ianmdlvl / dgit.git / blobdiff