deal with daft 3.0 quilt thing

[dgit.git] / dgit

diff --git a/dgit b/dgit
index be7769400a8f643071fd077a4c91ef8e18e23c5c..6d7e5740638ed259cd583e9d6f0ca89497f37988 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -414,10 +414,11 @@ Last allegedly pushed/uploaded: $oldclogp->{Version} (newer or same)
 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 $!;
@@ -485,7 +486,7 @@ sub fetch_from_archive () {
     } 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"
@@ -547,16 +548,53 @@ 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 commit_quilty_patch () {
+    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");
+    my @files;
+    foreach my $l (split /\n/, $output) {
+       next unless $l =~ s/^\?\? //;
+       next unless $fixups{$l};
+       push @files, $l;
+    }
+    print DEBUG "checking for quilty\n", Dumper(\@files);
+    if (@files == 2) {
+       runcmd_ordryrun @git, qw(add), @files;
+       runcmd_ordryrun
+           @git, qw(commit -m), "Commit Debian 3.0 (quilt) metadata";
+    }
 }
 
 sub dopush () {
-    runcmd @git, qw(diff --quiet HEAD);
+    print DEBUG "actually entering push\n";
+    runcmd qw(debian/rules clean);
     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();
+    }
+    check_not_dirty();
     prep_ud();
     chdir $ud or die $!;
     print "checking that $dscfn corresponds to HEAD\n";
@@ -670,6 +708,7 @@ sub cmd_pull {
 sub cmd_push {
     parseopts();
     die if defined $package;
+    runcmd @git, qw(diff --quiet HEAD);
     my $clogp = parsechangelog();
     $package = $clogp->{Source};
     if (@ARGV==0) {