die "@_ $! $?" if system @_;
}
+sub printdone {
+ if (!$dryrun) {
+ print "dgit ok: @_\n";
+ } else {
+ print "would be ok: @_ (but dry run only)\n";
+ }
+}
+
sub cmdoutput_errok {
die Dumper(\@_)." ?" if grep { !defined } @_;
printcmd(\*DEBUG,"|",@_) if $debug>0;
Perhaps the upload is stuck in incoming. Using the version from git.
END
$outputhash = $upload_hash;
- } else {
- die "version in archive is same as version in git".
- " to-be-uploaded (upload/) branch but archive".
- " version hash no commit hash?!\n";
+ } elsif ($outputhash ne $upload_hash) {
+ die "version in archive ($clogp->{Version})".
+ " is same as version in git".
+ " to-be-uploaded (upload/) branch ($oldclogp->{Version})".
+ " but archive version hash no commit hash?!\n";
}
}
chdir '../../../..' or die $!;
} else {
die "$lrref_fn $!";
}
- print DEBUG "last upload hash $upload_hash\n";
+ print DEBUG "previous reference hash $upload_hash\n";
my $hash;
if (defined $dsc_hash) {
die "missing git history even though dsc has hash"
}
fetch_from_archive() or die;
runcmd @git, qw(reset --hard), lrref();
- print "dgit ok: ready for work in $dstdir\n";
+ printdone "ready for work in $dstdir";
}
sub fetch () {
git_fetch_us();
}
fetch_from_archive() or die;
- print "dgit ok: fetched into ".lrref()."\n";
+ printdone "fetched into ".lrref();
}
sub pull () {
fetch();
runcmd_ordryrun @git, qw(merge -m),"Merge from $suite [dgit]",
lrref();
- print "dgit ok: fetched to ".lrref()." and merged into HEAD\n";
+ 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;
+ }
+ }
}
sub dopush () {
my $dscfn = "${package}_$clogp->{Version}.dsc";
stat "../$dscfn" or die "$dscfn $!";
$dsc = parsecontrol("../$dscfn");
+ check_not_dirty();
prep_ud();
chdir $ud or die $!;
print "checking that $dscfn corresponds to HEAD\n";
my $host = access_cfg('upload-host');
my @hostarg = defined($host) ? ($host,) : ();
runcmd_ordryrun @dput, @hostarg, $changesfile;
- print "dgit ok: pushed and uploaded $dsc->{Version}\n";
+ printdone "pushed and uploaded $dsc->{Version}";
}
sub cmd_clone {
sub cmd_push {
parseopts();
die if defined $package;
+ runcmd @git, qw(diff --quiet HEAD);
my $clogp = parsechangelog();
$package = $clogp->{Source};
if (@ARGV==0) {
}
parseopts();
+print STDERR "DRY RUN ONLY\n" if $dryrun;
die unless @ARGV;
my $cmd = shift @ARGV;