git-debrebase: fixes

[dgit.git] / git-debrebase

diff --git a/git-debrebase b/git-debrebase
index 982423a68b8c84d05a34be738879c7d497e4dcfb..71fb11e60f39b7ba7550efe26e63f0db40a34c9e 100755 (executable)
--- a/git-debrebase
+++ b/git-debrebase
@@ -131,9 +131,8 @@ memoize('cfg');
 
 sub get_commit ($) {
     my ($objid) = @_;
-    my ($type,$data) = git_cat_file $objid;
-    die unless $type eq 'commit';
-    $data =~ m/(?<=\n)\n/;
+    my $data = git_cat_file $objid, 'commit';
+    $data =~ m/(?<=\n)\n/ or die "$objid ($data) ?";
     return ($`,$');
 }
 
@@ -157,23 +156,23 @@ sub get_differs ($$) {
     my $differs = 0;
 
     my $rundiff = sub {
-       my ($opts, $sfx, $fn) = @_;
-       $opts //= [qw(--name-only)];
+       my ($opts, $limits, $fn) = @_;
        my @cmd = (@git, qw(diff-tree -z --no-renames));
        push @cmd, @$opts;
-       push @cmd, "$_:$sfx" foreach $x, $y;
+       push @cmd, "$_:" foreach $x, $y;
+       push @cmd, @$limits;
        my $diffs = cmdoutput @cmd;
        foreach (split /\0/, $diffs) { $fn->(); }
     };
 
-    $rundiff->(undef, '', sub {
+    $rundiff->([qw(--name-only)], [], sub {
         $differs |= $_ eq 'debian' ? D_DEB : D_UPS;
     });
 
     if ($differs & D_DEB) {
        $differs &= ~D_DEB;
-       $rundiff->(undef, ':debian', sub {
-            $differs |= $_ eq 'patches' ? D_PAT_OTH : D_DEB;
+       $rundiff->([qw(--name-only -r)], [qw(debian)], sub {
+            $differs |= $_ eq m{^debian/patches/} ? D_PAT_OTH : D_DEB;
        });
        die "mysterious debian changes $x..$y"
            unless $differs & (D_PAT_OTH|D_DEB);
@@ -186,11 +185,12 @@ sub get_differs ($$) {
            $differs |= D_PAT_OTH;
            no warnings qw(exiting);  last;
        };
-       $rundiff->([qw(--name-status)], ':debian/patches', sub {
+       $rundiff->([qw(--name-status -r)], [qw(debian/patches/)], sub {
             no warnings qw(exiting);
             if (!defined $mode) {
                $mode = $_;  next;
            }
+           die unless s{^debian/patches/}{};
            my $ok;
            if ($mode eq 'A' && !m/(?:^|\.)series$/s) {
                $ok = 1;
@@ -358,7 +358,7 @@ sub classify ($) {
                           Contributor => $bytime[1]);
     }
     foreach my $p (@p) {
-       my ($p_h, $p_m) = get_commit $p;
+       my ($p_h, $p_m) = get_commit $p->{CommitId};
        $p->{IsOrigin} = $p_h !~ m/^parent \w+$/m;
        ($p->{IsDgitImport},) = $p_m =~ m/^\[dgit import ([0-9a-z]+) .*\]$/m;
     }
@@ -486,10 +486,11 @@ sub walk ($;$$) {
            $cur = $p0;
            next;
        } elsif ($ty eq 'Pseudomerge') {
-           print $report " Contributor=$cl->{Contributor}" if $report;
+           my $contrib = $cl->{Contributor}{CommitId};
+           print $report " Contributor=$contrib" if $report;
            push @pseudomerges, $cl;
            $rewrite_from_here->();
-           $cur = $ty->{Contributor};
+           $cur = $contrib;
            next;
        } elsif ($ty eq 'BreakwaterUpstreamMerge') {
            $build_start->("PreviousBreakwater", $cur);
@@ -658,7 +659,7 @@ sub update_head ($$$) {
 }
 
 sub cmd_launder () {
-    badusage "no arguments to launder allowed";
+    badusage "no arguments to launder allowed" if @ARGV;
     my $old = get_head();
     my ($tip,$breakwater) = walk $old;
     update_head $old, $tip, 'launder';