X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=git-debrebase;h=c999dd62c89390f5ffdee37b2d502245515ab6bd;hb=4297c0a55a779c5fbc5032b962d1bd766b33b581;hp=15196fe42eba2214e4835ee62c84c62d6455eb45;hpb=bb4bf5def7c06e5451fabe8d0a7d028873d753cf;p=dgit.git

diff --git a/git-debrebase b/git-debrebase
index 15196fe4..c999dd62 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -108,8 +108,9 @@ 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);
+use Debian::Dgit qw(:DEFAULT :playground);
 
 sub badusage ($) {
     my ($m) = @_;
@@ -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 ($`,$');
 }
 
@@ -141,10 +141,27 @@ sub D_UPS ()     { return 0x2; } # upstream files
 sub D_PAT_ADD () { return 0x4; } # debian/patches/ extra patches at end
 sub D_PAT_OTH () { return 0x8; } # debian/patches other changes
 
-our $rd = ".git/git-debrebase";
-our $ud = "$rd/work";
+
+our $playprefix = 'debrebase';
+our $rd;
+
 our @git = qw(git);
 
+sub in_workarea ($) {
+    my ($sub) = @_;
+    changedir "$playground/work";
+    my $r = eval { $sub->(); };
+    changedir $maindir;
+}
+
+sub fresh_workarea () {
+    do {
+	local $playground;
+	fresh_playground "$playprefix/work";
+    };
+    in_workarea sub { playtree_setup };
+}
+
 sub get_differs ($$) {
     my ($x,$y) = @_;
     # This resembles quiltify_trees_differ, in dgit, a bit.
@@ -155,25 +172,24 @@ sub get_differs ($$) {
 
     my $differs = 0;
 
-    my $f;
     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;
-	my $diffs = cmdoutput @cmd, $x, $y;
-	foreach $f (split /\0/, $diffs) { $fn->(); }
+	push @cmd, "$_:" foreach $x, $y;
+	push @cmd, @$limits;
+	my $diffs = cmdoutput @cmd;
+	foreach (split /\0/, $diffs) { $fn->(); }
     };
 
-    $rundiff->(undef, '', 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->(undef, ':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);
@@ -186,15 +202,16 @@ 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 = $f;  next;
+		$mode = $_;  next;
 	    }
+	    die unless s{^debian/patches/}{};
 	    my $ok;
-	    if ($mode eq 'A' && $f !~ m/(?:^|\.)series$/s) {
+	    if ($mode eq 'A' && !m/(?:^|\.)series$/s) {
 		$ok = 1;
-	    } elsif ($mode eq 'M' && $f eq 'series') {
+	    } 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";
@@ -209,6 +226,8 @@ sub get_differs ($$) {
 	    unless $differs & (D_PAT_ADD|D_PAT_OTH);
     }
 
+    printdebug sprintf "get_differs %s, %s = %#x\n", $x, $y, $differs;
+
     return $differs;
 }
 
@@ -267,7 +286,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 = {
@@ -286,14 +305,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;
     };
 
@@ -346,7 +375,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;
     }
@@ -363,6 +392,8 @@ sub classify ($) {
     my ($stype, $series) = git_cat_file "$t:debian/patches/series";
     my $haspatches = $stype ne 'missing' && $series =~ m/^\s*[^#\n\t ]/m;
 
+@p = reverse @p; #xxx
+
     # How to decide about l/r ordering of breakwater merges ?  git
     # --topo-order prefers to expand 2nd parent first.  There's
     # already an easy rune to look for debian/ history anyway (git log
@@ -474,10 +505,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);
@@ -555,13 +587,13 @@ sub walk ($;$$) {
 
     # Now we build it back up again
 
-    workarea_fresh();
+    fresh_workarea();
 
     my $rewriting = 0;
 
     my $rm_tree_cached = sub {
 	my ($subdir) = @_;
-	runcmd @git, qw(rm --quiet -rf --cached), $subdir;
+	runcmd @git, qw(rm --quiet -rf --cached --ignore-unmatch), $subdir;
     };
     my $read_tree_debian = sub {
 	my ($treeish) = @_;
@@ -646,7 +678,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';
@@ -665,13 +697,19 @@ 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: $!";
 
+fresh_playground $playprefix;
+$rd = ensure_a_playground "playprefix/misc";
+
 my $cmd = shift @ARGV;
 my $cmdfn = $cmd;
 $cmdfn =~ y/-/_/;