X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=dgit;h=7f13eecd19600c93d63008223fada04570e91011;hb=648c039155014bc10acdae59e0dad5aacd000967;hp=f724369ab36d40381eaceb9884a4383e1cc84919;hpb=c49ed487a8eba41e990e483dc1851c817ed5237a;p=dgit.git
diff --git a/dgit b/dgit
index f724369a..7f13eecd 100755
--- a/dgit
+++ b/dgit
@@ -27,7 +27,7 @@ use File::Path;
use Dpkg::Version;
use POSIX;
-our $suite = 'sid';
+our $isuite = 'unstable';
our $package;
our $sign = 1;
@@ -42,7 +42,6 @@ our (@git) = qw(git);
our (@dget) = qw(dget);
our (@dput) = qw(dput);
our (@debsign) = qw(debsign);
-our (@cleancmd) = qw(debian/rules clean);
our $keyid;
our $debug = 0;
@@ -55,16 +54,28 @@ our %opts_opt_map = ('dget' => \@dget,
our $remotename = 'dgit';
our $ourdscfield = 'Vcs-Dgit-Master';
our $branchprefix = 'dgit';
+our $csuite;
-sub lbranch () { return "$branchprefix/$suite"; }
+sub lbranch () { return "$branchprefix/$csuite"; }
my $lbranch_re = '^refs/heads/'.$branchprefix.'/([^/.]+)$';
sub lref () { return "refs/heads/".lbranch(); }
-sub lrref () { return "refs/remotes/$remotename/$suite"; }
-sub rrref () { return "refs/$branchprefix/$suite"; }
+sub lrref () { return "refs/remotes/$remotename/$csuite"; }
+sub rrref () { return "refs/$branchprefix/$csuite"; }
sub debiantag ($) { return "debian/$_[0]"; }
+our $us = 'dgit';
+
+sub fail () { die "$us: @_\n"; }
+
+sub badcfg () { print STDERR "$us: invalid configuration: @_\n"; exit 12; }
+
+sub no_such_package () {
+ print STDERR "$us: package $package does not exist in suite $suite\n";
+ exit 4;
+}
+
sub fetchspec () {
- local $suite = '*';
+ local $csuite = '*';
return "+".rrref().":".lrref();
}
@@ -75,9 +86,10 @@ sub url_get {
$ua = LWP::UserAgent->new();
$ua->env_proxy;
}
- print "downloading @_...\n";
+ my $what = $_[$#_];
+ print "downloading $what...\n";
my $r = $ua->get(@_) or die $!;
- die "$_[0]: ".$r->status_line."; failed.\n" unless $r->is_success;
+ $r->is_success or fail "failed to fetch $what: ".$r->status_line;
return $r->decoded_content();
}
@@ -99,10 +111,23 @@ sub printcmd {
print $fh "\n" or die $!;
}
+sub failedcmd {
+ { local ($!); printcmd \*STDERR, "$_[0]: failed command:", @_ or die $!; };
+ if ($!) {
+ fail "failed to fork/exec: $!";
+ } elsif (!($? & 0xff)) {
+ fail "subprocess failed with error exit status ".($?>>8);
+ } elsif ($?) {
+ fail "subprocess crashed (wait status $?)";
+ } else {
+ fail "subprocess produced invalid output";
+ }
+}
+
sub runcmd {
printcmd(\*DEBUG,"+",@_) if $debug>0;
$!=0; $?=0;
- die "@_ $! $?" if system @_;
+ failedcmd @_ if system @_;
}
sub printdone {
@@ -120,7 +145,7 @@ sub cmdoutput_errok {
my $d;
$!=0; $?=0;
{ local $/ = undef; $d =
; }
- die if P->error;
+ die $! if P->error;
if (!close P) { print DEBUG "=>!$?\n" if $debug>0; return undef; }
chomp $d;
$d =~ m/^.*/;
@@ -130,7 +155,7 @@ sub cmdoutput_errok {
sub cmdoutput {
my $d = cmdoutput_errok @_;
- defined $d or die "@_ $? $!";
+ defined $d or failedcmd @_;
return $d;
}
@@ -146,56 +171,90 @@ sub runcmd_ordryrun {
}
}
+our $helpmsg = < sign tag and package with instead of default
+ --dry-run -n do not change anything, but go through the motions
+ --new -N allow introducing a new package
+ --debug -D increase debug level
+ -c= set git config option (used directly by dgit too)
+END
+
+sub badusage {
+ print STDERR "$us: @_\n", $helpmsg or die $!;
+ exit 8;
+}
+
+sub helponly () {
+ print $helpmsg or die $!;
+ exit 0;
+}
+
our %defcfg = ('dgit.default.distro' => 'debian',
'dgit.default.username' => '',
'dgit.default.archive-query-default-component' => 'main',
'dgit.default.ssh' => 'ssh',
- 'dgit-distro.debian.git-host' => 'git.debian.org',
+ 'dgit-distro.debian.git-host' => 'dgit.debian.net',
'dgit-distro.debian.git-proto' => 'git+ssh://',
'dgit-distro.debian.git-path' => '/git/dgit-repos',
'dgit-distro.debian.git-check' => 'ssh-cmd',
'dgit-distro.debian.git-create' => 'ssh-cmd',
+ 'dgit-distro.debian.sshdakls-host' => 'coccia.debian.org',
+ 'dgit-distro.debian.sshdakls-dir' =>
+ '/srv/ftp-master.debian.org/ftp/dists',
'dgit-distro.debian.mirror' => 'http://http.debian.net/debian/');
sub cfg {
foreach my $c (@_) {
+ return undef if $c =~ /RETURN-UNDEF/;
+ my @cmd = (@git, qw(config --), $c);
my $v;
{
local ($debug) = $debug-1;
- $v = cmdoutput_errok(@git, qw(config --), $c);
+ $v = cmdoutput_errok @cmd;
};
if ($?==0) {
return $v;
} elsif ($?!=256) {
- die "$c $?";
+ failedcmd @cmd;
}
my $dv = $defcfg{$c};
return $dv if defined $dv;
}
- return undef;
+ badcfg "need value for one of: @_";
}
sub access_distro () {
- return cfg("dgit-suite.$suite.distro",
+ return cfg("dgit-suite.$isuite.distro",
"dgit.default.distro");
}
-sub access_cfg ($) {
- my ($key) = @_;
+sub access_cfg (@) {
+ my (@keys) = @_;
my $distro = access_distro();
- my $value = cfg("dgit-distro.$distro.$key",
- "dgit.default.$key");
+ my $value = cfg(map { ("dgit-distro.$distro.$_",
+ "dgit.default.$_") } @keys);
return $value;
}
+sub access_someuserhost ($) {
+ my ($some) = @_;
+ my $user = access_cfg("$some-user",'username');
+ my $host = access_cfg("$some-host");
+ return length($user) ? "$user\@$host" : $host;
+}
+
sub access_gituserhost () {
- my $user = access_cfg('git-user');
- my $host = access_cfg('git-host');
- return defined($user) && length($user) ? "$user\@$host" : $host;
+ return access_someuserhost('git');
}
sub access_giturl () {
- my $url = access_cfg('git-url');
+ my $url = access_cfg('git-url','RETURN-UNDEF');
if (!defined $url) {
$url =
access_cfg('git-proto').
@@ -205,33 +264,92 @@ sub access_giturl () {
return "$url/$package.git";
}
+sub parsecontrolfh ($$@) {
+ my ($fh, $desc, @opts) = @_;
+ my $c = Dpkg::Control::Hash->new({ 'name' => $desc, @opts });
+ $c->parse($fh) or die "parsing of $desc failed";
+}
+
sub parsecontrol {
- my $c = Dpkg::Control::Hash->new();
- $c->load(@_) or return undef;
+ my ($file, $desc) = @_;
+ my $fh = new IO::File '<', $file or die "$file: $!";
+ my $c = parsecontrolfh($fh,$desc);
+ $fh->error and die $!;
+ close $fh;
return $c;
}
+sub getfield ($$) {
+ my ($dctrl,$field) = @_;
+ my $v = $dctrl->{$field};
+ return $v if defined $v;
+ fail "missing field $field in ".$v->get_option('name');
+}
+
sub parsechangelog {
my $c = Dpkg::Control::Hash->new();
my $p = new IO::Handle;
- open $p, '-|', qw(dpkg-parsechangelog) or die $!;
+ my @cmd = (qw(dpkg-parsechangelog));
+ open $p, '-|', @cmd or die $!;
$c->parse($p);
- $?=0; $!=0; close $p or die "$! $?";
+ $?=0; $!=0; close $p or failedcmd @cmd;
return $c;
}
our %rmad;
-sub archive_query () {
- my $query = access_cfg('archive-query');
- $query ||= "madison:".access_distro();
- $query =~ s/^(\w+):// or die "$query ?";
+sub archive_query ($) {
+ my ($method) = @_;
+ my $query = access_cfg('archive-query','RETURN-UNDEF');
+ if (!defined $query) {
+ my $distro = access_distro();
+ if ($distro eq 'debian') {
+ $query = "sshdakls:".
+ access_someuserhost('sshdakls').':'.
+ access_cfg('sshdakls-dir');
+ } else {
+ $query = "madison:$distro";
+ }
+ }
+ $query =~ s/^(\w+):// or badcfg "invalid archive-query method \`$query'";
my $proto = $1;
- my $url = $'; #';
+ my $data = $'; #';
+ { no strict qw(refs); &{"${method}_${proto}"}($proto,$data); }
+}
+
+sub archive_query_madison ($$) {
+ my ($proto,$data) = @_;
die unless $proto eq 'madison';
$rmad{$package} ||= cmdoutput
- qw(rmadison -asource),"-s$suite","-u$url",$package;
+ qw(rmadison -asource),"-s$isuite","-u$data",$package;
my $rmad = $rmad{$package};
+ return madison_parse($rmad);
+}
+
+sub archive_query_sshdakls ($$) {
+ my ($proto,$data) = @_;
+ $data =~ s/:.*// or badcfg "invalid sshdakls method string \`$data'";
+ my $dakls = cmdoutput
+ access_cfg('ssh'), $data, qw(dak ls -asource),"-s$isuite",$package;
+ return madison_parse($dakls);
+}
+
+sub canonicalise_suite_sshdakls ($$) {
+ my ($proto,$data) = @_;
+ $data =~ m/:/ or badcfg "invalid sshdakls method string \`$data'";
+ my @cmd =
+ (access_cfg('ssh'), $`,
+ "set -e; cd $';".
+ " if test -h $isuite; then readlink $isuite; exit 0; fi;".
+ " if test -d $isuite; then echo $isuite; exit 0; fi;".
+ " exit 1");
+ my $dakls = cmdoutput @cmd;
+ failedcmd @cmd unless $dakls =~ m/^\w/;
+ return $dakls;
+}
+
+sub madison_parse ($) {
+ my ($rmad) = @_;
if (!length $rmad) {
return ();
}
@@ -241,11 +359,7 @@ sub archive_query () {
\s*( [^ \t|]+ )\s* }x or die "$rmad $?";
$1 eq $package or die "$rmad $package ?";
my $vsn = $2;
- if ($suite ne $3) {
- # madison canonicalises for us
- print "canonical suite name for $suite is $3\n";
- $suite = $3;
- }
+ my $newsuite = $3;
my $component;
if (defined $4) {
$component = $4;
@@ -255,39 +369,53 @@ sub archive_query () {
$5 eq 'source' or die "$rmad ?";
my $prefix = substr($package, 0, $package =~ m/^l/ ? 4 : 1);
my $subpath = "/pool/$component/$prefix/$package/${package}_$vsn.dsc";
- return ($vsn,$subpath);
+ return ($vsn,$subpath,$newsuite);
+}
+
+sub canonicalise_suite_madison ($$) {
+ my @r = archive_query_madison($_[0],$_[1]);
+ @r or fail
+ "unable to canonicalise suite using package $package".
+ " which does not appear to exist in suite $suite;".
+ " --existing-package may help";
+ return $r[2];
}
sub canonicalise_suite () {
- archive_query() or die;
+ $csuite = archive_query('canonicalise_suite');
+ if ($isuite ne $csuite) {
+ # madison canonicalises for us
+ print "canonical suite name for $isuite is $csuite\n";
+ }
}
sub get_archive_dsc () {
- my ($vsn,$subpath) = archive_query();
+ my ($vsn,$subpath) = archive_query('archive_query');
+ canonicalise_suite();
if (!defined $vsn) { $dsc=undef; return undef; }
$dscurl = access_cfg('mirror').$subpath;
$dscdata = url_get($dscurl);
my $dscfh = new IO::File \$dscdata, '<' or die $!;
print DEBUG Dumper($dscdata) if $debug>1;
- $dsc = Dpkg::Control::Hash->new(allow_pgp=>1);
- $dsc->parse($dscfh, 'dsc') or die "parsing of $dscurl failed\n";
+ $dsc = parsecontrolfh($dscfh,$dscurl, allow_pgp=>1);
print DEBUG Dumper($dsc) if $debug>1;
- my $fmt = $dsc->{Format};
- die "unsupported format $fmt, sorry\n" unless $format_ok{$fmt};
+ my $fmt = getfield $dsc 'Format';
+ fail "unsupported source format $fmt, sorry" unless $format_ok{$fmt};
}
sub check_for_git () {
# returns 0 or 1
my $how = access_cfg('git-check');
if ($how eq 'ssh-cmd') {
- my $r= cmdoutput
+ my @cmd =
(access_cfg('ssh'),access_gituserhost(),
" set -e; cd ".access_cfg('git-path').";".
" if test -d $package.git; then echo 1; else echo 0; fi");
- die "$r $! $?" unless $r =~ m/^[01]$/;
+ my $r= cmdoutput @cmd;
+ failedcmd @cmd unless $r =~ m/^[01]$/;
return $r+0;
} else {
- die "unknown git-check $how ?";
+ badcfg "unknown git-check \`$how'";
}
}
@@ -301,7 +429,7 @@ sub create_remote_git_repo () {
" cd $package.git;".
" if ! test -d objects; then git init --bare; fi");
} else {
- die "unknown git-create $how ?";
+ badcfg "unknown git-create \`$how'";
}
}
@@ -334,10 +462,13 @@ sub mktree_in_ud_from_only_subdir () {
}
sub dsc_files () {
+ my $field = $dsc->{'Checksums-Sha256'} || $dsc->{Files};
+ fail "missing both Checksums-Sha256 and Files in ".$dsc->get_option('name');
map {
- m/^\w+ \d+ (\S+)$/ or die "$_ ?";
+ m/^\w+ \d+ (\S+)$/ or
+ fail "could not parse .dsc Files/Checksums line \`$_'";
$1;
- } grep m/\S/, split /\n/, ($dsc->{'Checksums-Sha256'} || $dsc->{Files});
+ } grep m/\S/, split /\n/, $field;
}
sub is_orig_file ($) {
@@ -355,7 +486,7 @@ sub generate_commit_from_dsc () {
chdir $ud or die $!;
my @files;
foreach my $f (dsc_files()) {
- die if $f =~ m#/|^\.|\.dsc$|\.tmp$#;
+ die "$f ?" if $f =~ m#/|^\.|\.dsc$|\.tmp$#;
push @files, $f;
link "../../../$f", $f
or $!==&ENOENT
@@ -369,32 +500,36 @@ sub generate_commit_from_dsc () {
}
my ($tree,$dir) = mktree_in_ud_from_only_subdir();
runcmd qw(sh -ec), 'dpkg-parsechangelog >../changelog.tmp';
- my $clogp = parsecontrol('../changelog.tmp','changelog') or die;
- my $date = cmdoutput qw(date), '+%s %z', qw(-d),$clogp->{Date};
- my $author = $clogp->{Maintainer};
+ my $clogp = parsecontrol('../changelog.tmp',"commit's changelog");
+ my $date = cmdoutput qw(date), '+%s %z', qw(-d), getfield($clogp,'Date');
+ my $author = getfield $clogp, 'Maintainer';
$author =~ s#,.*##ms;
my $authline = "$author $date";
- $authline =~ m/^[^<>]+ \<\S+\> \d+ [-+]\d+$/ or die $authline;
+ $authline =~ m/^[^<>]+ \<\S+\> \d+ [-+]\d+$/ or
+ fail "unexpected commit author line format \`$authline'".
+ " (was generated from changelog Maintainer field)";
+ my $changes = getfield $clogp, 'Changes';
open C, ">../commit.tmp" or die $!;
print C <{Changes}
+$chhanges
# imported from the archive
END
close C or die $!;
my $outputhash = make_commit qw(../commit.tmp);
- print "synthesised git commit from .dsc $clogp->{Version}\n";
+ my $cversion = getfield $clogp, 'Version';
+ print "synthesised git commit from .dsc $cversion\n";
if ($upload_hash) {
runcmd @git, qw(reset --hard), $upload_hash;
runcmd qw(sh -ec), 'dpkg-parsechangelog >>../changelogold.tmp';
- my $oldclogp = Dpkg::Control::Hash->new();
- $oldclogp->load('../changelogold.tmp','previous changelog') or die;
+ my $oldclogp = parsecontrol('../changelogold.tmp','previous changelog');
+ my $oversion = getfield $oldclogp, 'Version';
my $vcmp =
- version_compare_string($oldclogp->{Version}, $clogp->{Version});
+ version_compare_string($oversion, $cversion);
if ($vcmp < 0) {
# git upload/ is earlier vsn than archive, use archive
open C, ">../commit2.tmp" or die $!;
@@ -405,25 +540,25 @@ parent $outputhash
author $authline
committer $authline
-Record $package ($clogp->{Version}) in archive suite $suite
+Record $package ($cversion) in archive suite $csuite
END
$outputhash = make_commit qw(../commit2.tmp);
} elsif ($vcmp > 0) {
print STDERR <{Version} (older)
-Last allegedly pushed/uploaded: $oldclogp->{Version} (newer or same)
+Version actually in archive: $cversion (older)
+Last allegedly pushed/uploaded: $oversion (newer or same)
Perhaps the upload is stuck in incoming. Using the version from git.
END
$outputhash = $upload_hash;
} elsif ($outputhash ne $upload_hash) {
- die "version in archive ($clogp->{Version})".
+ fail "version in archive ($cversion)".
" is same as version in git".
- " to-be-uploaded (upload/) branch ($oldclogp->{Version})".
- " but archive version hash no commit hash?!\n";
+ " to-be-uploaded (upload/) branch ($oversion)".
+ " but archive version hash no commit hash?!";
}
}
chdir '../../../..' or die $!;
- runcmd @git, qw(update-ref -m),"dgit fetch import $clogp->{Version}",
+ runcmd @git, qw(update-ref -m),"dgit fetch import $cversion",
'DGIT_ARCHIVE', $outputhash;
cmdoutput @git, qw(log -n2), $outputhash;
# ... gives git a chance to complain if our commit is malformed
@@ -460,7 +595,7 @@ sub is_fast_fwd ($$) {
}
sub git_fetch_us () {
- die "cannot dry run with fetch" if $dryrun;
+ badusage "cannot dry run with fetch" if $dryrun;
runcmd @git, qw(fetch),access_giturl(),fetchspec();
}
@@ -470,7 +605,7 @@ sub fetch_from_archive () {
get_archive_dsc() or return 0;
$dsc_hash = $dsc->{$ourdscfield};
if (defined $dsc_hash) {
- $dsc_hash =~ m/\w+/ or die "$dsc_hash $?";
+ $dsc_hash =~ m/\w+/ or fail "invalid hash in .dsc \`$dsc_hash'";
$dsc_hash = $&;
print "last upload to archive specified git hash\n";
} else {
@@ -490,7 +625,9 @@ sub fetch_from_archive () {
print DEBUG "previous reference hash $upload_hash\n";
my $hash;
if (defined $dsc_hash) {
- die "missing git history even though dsc has hash"
+ fail "missing git history even though dsc has hash -"
+ " could not find commit $dsc_hash"
+ " (should be in ".access_giturl()."#".rref().")";
unless $upload_hash;
$hash = $dsc_hash;
ensure_we_have_orig();
@@ -499,7 +636,7 @@ sub fetch_from_archive () {
}
print DEBUG "current hash $hash\n";
if ($upload_hash) {
- die "not fast forward on last upload branch!".
+ fail "not fast forward on last upload branch!".
" (archive's version left in DGIT_ARCHIVE)"
unless is_fast_fwd($upload_hash, $hash);
}
@@ -516,7 +653,8 @@ sub fetch_from_archive () {
sub clone ($) {
my ($dstdir) = @_;
- die "dry run makes no sense with clone" if $dryrun;
+ canonicalise_suite();
+ badusage "dry run makes no sense with clone" if $dryrun;
mkdir $dstdir or die "$dstdir $!";
chdir "$dstdir" or die "$dstdir $!";
runcmd @git, qw(init -q);
@@ -532,7 +670,7 @@ sub clone ($) {
} else {
print "starting new git history\n";
}
- fetch_from_archive() or die;
+ fetch_from_archive() or no_such_package;
runcmd @git, qw(reset --hard), lrref();
printdone "ready for work in $dstdir";
}
@@ -541,34 +679,26 @@ sub fetch () {
if (check_for_git()) {
git_fetch_us();
}
- fetch_from_archive() or die;
+ fetch_from_archive() or no_such_package();
printdone "fetched into ".lrref();
}
sub pull () {
fetch();
- runcmd_ordryrun @git, qw(merge -m),"Merge from $suite [dgit]",
+ runcmd_ordryrun @git, qw(merge -m),"Merge from $csuite [dgit]",
lrref();
printdone "fetched to ".lrref()." and merged into HEAD";
}
sub check_not_dirty () {
- my $output = cmdoutput @git, qw(status --porcelain);
- if (length $output) {
- my $m = "tree dirty:\n$output\n";
- if (!$dryrun) {
- die $m;
- } else {
- warn $m;
- }
- }
+ runcmd @git, qw(diff --quiet);
}
-sub commit_quilty_patch () {
+sub commit_quilty_patch ($) {
+ my ($vsn) = @_;
my $output = cmdoutput @git, qw(status --porcelain);
- my $vsn = $dsc->{Version};
my %fixups = map {$_=>1}
- (".pc/debian-changes-$vsn/","debian/patches/debian-changes-2.8-5");
+ (".pc/debian-changes-$vsn/","debian/patches/debian-changes-$vsn");
my @files;
foreach my $l (split /\n/, $output) {
next unless $l =~ s/^\?\? //;
@@ -577,23 +707,33 @@ sub commit_quilty_patch () {
}
print DEBUG "checking for quilty\n", Dumper(\@files);
if (@files == 2) {
+ my $m = "Commit Debian 3.0 (quilt) metadata";
+ print "$m\n";
runcmd_ordryrun @git, qw(add), @files;
- runcmd_ordryrun
- @git, qw(commit -m), "Commit Debian 3.0 (quilt) metadata";
+ runcmd_ordryrun @git, qw(commit -m), $m;
}
}
sub dopush () {
print DEBUG "actually entering push\n";
- runcmd @cleancmd;
my $clogp = parsechangelog();
- $package = $clogp->{Source};
- my $dscfn = "${package}_$clogp->{Version}.dsc";
- stat "../$dscfn" or die "$dscfn $!";
- $dsc = parsecontrol("../$dscfn");
- print DEBUG "format $dsc->{Format}\n";
- if ($dsc->{Format} eq '3.0 (quilt)') {
- commit_quilty_patch();
+ $package = getfield $clogp 'Source';
+ my $cversion = getfield $clogp, 'Version';
+ my $dscfn = "${package}_${cversion}.dsc";
+ stat "../$dscfn" or
+ fail "looked for .dsc $dscfn, but $!;".
+ " maybe you forgot to build";
+ $dsc = parsecontrol("../$dscfn","$dscfn");
+ my $dscpackage = getfield $dsc, 'Source';
+ my $format = getfield $dsc, 'Format';
+ my $dversion = getfield $dsc, 'Version';
+ ($dscpackage eq $package && $dversion eq $cversion)
+ fail "$dsc is for $dscpackage $dversion".
+ " but debian/changelog is for $package $cversion";
+ print DEBUG "format $format\n";
+ if ($format eq '3.0 (quilt)') {
+ print "Format \`$format', urgh\n";
+ commit_quilty_patch($dversion);
}
check_not_dirty();
prep_ud();
@@ -602,7 +742,17 @@ sub dopush () {
runcmd qw(dpkg-source -x --), "../../../../$dscfn";
my ($tree,$dir) = mktree_in_ud_from_only_subdir();
chdir '../../../..' or die $!;
- runcmd @git, qw(diff --exit-code), $tree;
+ printcmd \@DEBUG,"+",@_;
+ my @diffcmd = (@git, qw(diff --exit-code), $tree);
+ $!=0; $?=0;
+ if (system @diffcmd) {
+ if ($! && $?==256) {
+ fail "$dscfn specifies a different tree to your HEAD commit;".
+ " perhaps you forgot to build";
+ } else {
+ failedcmd @diffcmd;
+ }
+ }
#fetch from alioth
#do fast forward check and maybe fake merge
# if (!is_fast_fwd(mainbranch
@@ -611,25 +761,27 @@ sub dopush () {
# (uploadbranch());
$dsc->{$ourdscfield} = rev_parse('HEAD');
$dsc->save("../$dscfn.tmp") or die $!;
- if (!$dryrun) {
- rename "../$dscfn.tmp","../$dscfn" or die "$dscfn $!";
- } else {
- print "[new .dsc left in $dscfn.tmp]\n";
- }
if (!$changesfile) {
- my $pat = "../${package}_$clogp->{Version}_*.changes";
- my @cs = glob $pat;
- die "$pat ?" unless @cs==1;
+ my $pat = "${package}_c$version_*.changes";
+ my @cs = glob "../$pat";
+ fail "failed to find unique changes file".
+ " (looked for $pat in ..); perhaps you need to use dgit -C"
+ unless @cs==1;
($changesfile) = @cs;
}
- my $tag = debiantag($dsc->{Version});
+ my $tag = debiantag($dversion);
if (!check_for_git()) {
create_remote_git_repo();
}
runcmd_ordryrun @git, qw(push),access_giturl(),"HEAD:".rrref();
+ if (!$dryrun) {
+ rename "../$dscfn.tmp","../$dscfn" or die "$dscfn $!";
+ } else {
+ print "[new .dsc left in $dscfn.tmp]\n";
+ }
if ($sign) {
my @tag_cmd = (@git, qw(tag -s -m),
- "Release $dsc->{Version} for $suite [dgit]");
+ "Release $dversion for $csuite [dgit]");
push @tag_cmd, qw(-u),$keyid if defined $keyid;
push @tag_cmd, $tag;
runcmd_ordryrun @tag_cmd;
@@ -639,26 +791,27 @@ sub dopush () {
runcmd_ordryrun @debsign_cmd;
}
runcmd_ordryrun @git, qw(push),access_giturl(),"refs/tags/$tag";
- my $host = access_cfg('upload-host');
+ my $host = access_cfg('upload-host','RETURN-UNDEF');
my @hostarg = defined($host) ? ($host,) : ();
runcmd_ordryrun @dput, @hostarg, $changesfile;
- printdone "pushed and uploaded $dsc->{Version}";
+ printdone "pushed and uploaded $dversion";
}
sub cmd_clone {
parseopts();
my $dstdir;
- die if defined $package;
+ badusage "-p is not allowed with clone; specify as argument instead"
+ if defined $package;
if (@ARGV==1) {
($package) = @ARGV;
} elsif (@ARGV==2 && $ARGV[1] =~ m#^\w#) {
- ($package,$suite) = @ARGV;
+ ($package,$isuite) = @ARGV;
} elsif (@ARGV==2 && $ARGV[1] =~ m#^[./]#) {
($package,$dstdir) = @ARGV;
} elsif (@ARGV==3) {
- ($package,$suite,$dstdir) = @ARGV;
+ ($package,$isuite,$dstdir) = @ARGV;
} else {
- die;
+ badusage "incorrect arguments to dgit clone";
}
$dstdir ||= "$package";
clone($dstdir);
@@ -675,22 +828,22 @@ sub branchsuite () {
sub fetchpullargs () {
if (!defined $package) {
- my $sourcep = parsecontrol('debian/control');
- $package = $sourcep->{Source};
+ my $sourcep = parsecontrol('debian/control','debian/control');
+ $package = getfield $sourcep, 'Source';
}
if (@ARGV==0) {
- $suite = branchsuite();
- if (!$suite) {
+# $isuite = branchsuite(); # this doesn't work because dak hates canons
+ if (!$isuite) {
my $clogp = parsechangelog();
- $suite = $clogp->{Distribution};
+ $isuite = getfield $clogp, 'Distribution';
}
canonicalise_suite();
- print "fetching from suite $suite\n";
+ print "fetching from suite $csuite\n";
} elsif (@ARGV==1) {
- ($suite) = @ARGV;
+ ($isuite) = @ARGV;
canonicalise_suite();
} else {
- die;
+ badusage "incorrect arguments to dgit fetch or dgit pull";
}
}
@@ -708,39 +861,48 @@ sub cmd_pull {
sub cmd_push {
parseopts();
- die if defined $package;
+ badusage "-p is not allowed with dgit push" if defined $package;
runcmd @git, qw(diff --quiet HEAD);
my $clogp = parsechangelog();
- $package = $clogp->{Source};
+ $package = getfield $clogp, 'Source';
if (@ARGV==0) {
- $suite = $clogp->{Distribution};
+ $isuite = getfield $clogp, 'Distribution';
if ($new_package) {
local ($package) = $existing_package; # this is a hack
canonicalise_suite();
}
} else {
- die;
+ badusage "incorrect arguments to dgit push";
}
if (fetch_from_archive()) {
is_fast_fwd(lrref(), 'HEAD') or die;
} else {
- die unless $new_package;
+ fail "package appears to be new in this suite;".
+ " if this is intentional, use --new";
}
dopush();
}
sub cmd_build {
# we pass further options and args to git-buildpackage
- die if defined $package;
+ badusage "-p is not allowed with dgit build" if defined $package;
+ my $clogp = parsechangelog();
+ $isuite = getfield $clogp, 'Distribution';
+ $package = getfield $clogp, 'Source';
+ my @cmd =
+ (qw(git-buildpackage -us -uc --git-no-sign-tags),
+ '--git-builder=dpkg-buildpackage -i\.git/ -I.git');
+ unless (grep { m/^--git-debian-branch/ } @ARGV) {
+ canonicalise_suite();
+ push @cmd, "--git-debian-branch=".lbranch();
+ }
+ runcmd_ordryrun @cmd, @ARGV;
+}
+
+sub cmd_quilt_fixup {
+ badusage "incorrect arguments to dgit quilt-fixup";
my $clogp = parsechangelog();
- $suite = $clogp->{Distribution};
- $package = $clogp->{Source};
- canonicalise_suite() unless grep { m/^--git-debian-branch/ } @ARGV;
- runcmd_ordryrun
- qw(git-buildpackage -us -uc --git-no-sign-tags),
- '--git-builder=dpkg-buildpackage -i\.git/ -I.git',
- "--git-debian-branch=".lbranch(),
- @ARGV;
+ commit_quilty_patch((getfield $clogp, Version));
}
sub parseopts () {
@@ -754,6 +916,8 @@ sub parseopts () {
$dryrun=1;
} elsif (m/^--no-sign$/) {
$sign=0;
+ } elsif (m/^--help$/) {
+ helponly();
} elsif (m/^--new$/) {
$new_package=1;
} elsif (m/^--(\w+)=(.*)/s && ($om = $opts_opt_map{$1})) {
@@ -762,15 +926,15 @@ sub parseopts () {
push @$om, $2;
} elsif (m/^--existing-package=(.*)/s) {
$existing_package = $1;
- } elsif (m/^--clean-command=(.*)/s) {
- @cleancmd = split /\s+/, $1;
} else {
- die "$_ ?";
+ badusage "unknown long option \`$_'";
}
} else {
while (m/^-./s) {
if (s/^-n/-/) {
$dryrun=1;
+ } elsif (s/^-h/-/) {
+ helponly();
} elsif (s/^-D/-/) {
open DEBUG, ">&STDERR" or die $!;
$debug++;
@@ -783,7 +947,7 @@ sub parseopts () {
} elsif (s/^-k(.*)//s) {
$keyid=$1;
} else {
- die "$_ ?";
+ badusage "unknown short option \`$_'";
}
}
}
@@ -792,7 +956,10 @@ sub parseopts () {
parseopts();
print STDERR "DRY RUN ONLY\n" if $dryrun;
-die unless @ARGV;
+if (!@ARGV) {
+ print STDERR $helpmsg or die $!;
+ exit 8;
+}
my $cmd = shift @ARGV;
-
+$cmd =~ y/-/_/;
{ no strict qw(refs); &{"cmd_$cmd"}(); }