X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=git-debrebase;h=71fb11e60f39b7ba7550efe26e63f0db40a34c9e;hb=de060de5abd543a46a6e08653ccbaef27c556a29;hp=b2839d59bb66d065d5e94df80d4dc65490593e5c;hpb=966d36a2520eb2c117d05e7a8cda8865fd46d2d2;p=dgit.git

diff --git a/git-debrebase b/git-debrebase
index b2839d59..71fb11e6 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -108,6 +108,7 @@ use Memoize;
 use Carp;
 use POSIX;
 use Data::Dumper;
+use Getopt::Long qw(:config posix_default gnu_compat bundling);
 
 use Debian::Dgit qw(:DEFAULT $wa);
 
@@ -130,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 ($`,$');
 }
 
@@ -147,39 +147,72 @@ our @git = qw(git);
 
 sub get_differs ($$) {
     my ($x,$y) = @_;
-    # This resembles quiltify_trees_differ, in dgit, a bit.  But: we
-    # don't care about modes, or dpkg-source-unrepresentable changes,
-    # and we don't need the plethora of different modes.
+    # This resembles quiltify_trees_differ, in dgit, a bit.
+    # But we don't care about modes, or dpkg-source-unrepresentable
+    # changes, and we don't need the plethora of different modes.
+    # Conversely we need to distinguish different kinds of changes to
+    # debian/ and debian/patches/.
 
     my $differs = 0;
 
-    my $f;
     my $rundiff = sub {
-	my ($sfx, $fn) = @_;
-	my @cmd = (@git, qw(diff-tree -z --name-only));
-	push @cmd "$_:$sfx" foreach $x, $y;
-	my $diffs = cmdoutput @bcmd, $x, $y;
-	foreach $f (split /\0/, $diffs) { $fn->(); }
+	my ($opts, $limits, $fn) = @_;
+	my @cmd = (@git, qw(diff-tree -z --no-renames));
+	push @cmd, @$opts;
+	push @cmd, "$_:" foreach $x, $y;
+	push @cmd, @$limits;
+	my $diffs = cmdoutput @cmd;
+	foreach (split /\0/, $diffs) { $fn->(); }
     };
 
-    $rundiff('', sub {
-        $differs |= $f eq 'debian' ? D_DEB : D_UPS;
+    $rundiff->([qw(--name-only)], [], sub {
+        $differs |= $_ eq 'debian' ? D_DEB : D_UPS;
     });
 
     if ($differs & D_DEB) {
 	$differs &= ~D_DEB;
-	$rundiff(':debian', sub {
-            $differs |= $f 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);
     }
 
     if ($differs & D_PAT_OTH) {
-	
-	
-    
-	
-	}
-	    $f eq '
+	my $mode;
+	$differs &= ~D_PAT_OTH;
+	my $pat_oth = sub {
+	    $differs |= D_PAT_OTH;
+	    no warnings qw(exiting);  last;
+	};
+	$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;
+	    } elsif ($mode eq 'M' && $_ eq 'series') {
+		my $x_s = git_cat_file "$x:debian/patches/series", 'blob';
+		my $y_s = git_cat_file "$y:debian/patches/series", 'blob';
+		chomp $x_s;  $x_s .= "\n";
+		$ok = $x_s eq substr($y_s, 0, length $x_s);
+	    } else {
+		# nope
+	    }
+	    $mode = undef;
+	    $differs |= $ok ? D_PAT_ADD : D_PAT_OTH;
+        });
+	die "mysterious debian/patches changes $x..$y"
+	    unless $differs & (D_PAT_ADD|D_PAT_OTH);
+    }
+
+    printdebug sprintf "get_differs %s, %s = %#x\n", $x, $y, $differs;
+
+    return $differs;
+}
 
 sub commit_pr_info ($) {
     my ($r) = @_;
@@ -236,7 +269,7 @@ sub classify ($) {
     my ($h,$m) = get_commit $objid;
 
     my ($t) = $h =~ m/^tree (\w+)$/m or die $objid;
-    my (@ph) = $h =~ m/^parent (\w+)$/m;
+    my (@ph) = $h =~ m/^parent (\w+)$/mg;
     my @p;
 
     my $r = {
@@ -255,14 +288,24 @@ sub classify ($) {
         };
     }
 
+    printdebug "classify $objid \$t=$t \@p",
+	(map { sprintf " %s/%#x", $_->{CommitId}, $_->{Differs} } @p),
+	"\n";
+
     my $classify = sub {
 	my ($type, @rest) = @_;
 	$r = { %$r, Type => $type, @rest };
+	if ($debuglevel) {
+	    my $dd = new Data::Dumper [ $r ];
+	    Terse $dd 1; Indent $dd 0; Useqq $dd 1;
+	    printdebug " = $type ".(Dump $dd)."\n";
+	}
 	return $r;
     };
     my $unknown = sub {
 	my ($why) = @_;
 	$r = { %$r, Type => qw(Unknown) };
+	printdebug " ** Unknown\n";
 	return $r;
     };
 
@@ -315,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;
     }
@@ -443,10 +486,11 @@ sub walk ($;$$) {
 	    $cur = $p0;
 	    next;
 	} elsif ($ty eq 'Pseudomerge') {
-	    print $report " Contributor=$ty->{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);
@@ -615,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';
@@ -634,10 +678,13 @@ sub cmd_analyse () {
 	$old = get_head();
     }
     my ($dummy,$breakwater) = walk $old, 1,*STDOUT;
-    print "$breakwater BREAKWATER\n";
     STDOUT->error and die $!;
 }
 
+GetOptions("D+" => \$debuglevel) or die badusage "bad options\n";
+initdebug('git-debrebase ');
+enabledebug if $debuglevel;
+
 my $toplevel = cmdoutput @git, qw(rev-parse --show-toplevel);
 chdir $toplevel or die "chdir $toplevel: $!";