do not clean after all

[dgit.git] / dgit

diff --git a/dgit b/dgit
index f65b51a73f356fd50c47596fec8572cfdbf73972..7f68b098cb23a1f85d79cc2a8a46b450439305cb 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -551,13 +551,42 @@ sub pull () {
     printdone "fetched to ".lrref()." and merged into HEAD";
 }
 
+sub check_not_dirty () {
+    runcmd @git, qw(diff --quiet);
+}
+
+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) {
+       my $m = "Commit Debian 3.0 (quilt) metadata";
+       print "$m\n";
+       runcmd_ordryrun @git, qw(add), @files;
+       runcmd_ordryrun @git, qw(commit -m), $m;
+    }
+}
+
 sub dopush () {
-    runcmd @git, qw(diff --quiet HEAD);
+    print DEBUG "actually entering push\n";
     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";
@@ -671,6 +700,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) {
@@ -696,6 +726,7 @@ sub cmd_build {
     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',