X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=git-debrebase;h=a3733a989d62ee890af7a8c948fe54443c5846a5;hp=21c0582a511fd6dd4041cce0e6abd00ab60ac0ae;hb=78dfec329693691f0ff468e444d7ae19aec220d1;hpb=79c250465c2ed53040e59975d3396ec00825f6e7

diff --git a/git-debrebase b/git-debrebase
index 21c0582a..a3733a98 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -110,7 +110,7 @@ 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) = @_;
@@ -141,10 +141,25 @@ 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 $workarea;
+
 our @git = qw(git);
 
+sub in_workarea ($) {
+    my ($sub) = @_;
+    changedir $workarea;
+    my $r = eval { $sub->(); };
+    changedir $maindir;
+}
+
+sub fresh_workarea () {
+    $workarea = fresh_playground "$playprefix/work";
+    in_workarea sub { playtree_setup };
+}
+
 sub get_differs ($$) {
     my ($x,$y) = @_;
     # This resembles quiltify_trees_differ, in dgit, a bit.
@@ -358,7 +373,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;
     }
@@ -375,19 +390,24 @@ 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
     # debian/) so debian breakwater branch should be 1st parent; that
     # way also there's also an easy rune to look for the upstream
     # patches (--topo-order).
+
+    my $prevbrw = 0;
+
     if (@p == 2 &&
 	!$haspatches &&
-	!$p[0]{IsOrigin} && # breakwater merge never starts with an origin
-	!($p[0]{Differs} & ~D_DEB) &&
-	!($p[1]{Differs} & ~D_UPS)) {
+	!$p[$prevbrw]{IsOrigin} && # breakwater never starts with an origin
+	!($p[$prevbrw]{Differs} & ~D_DEB) &&
+	!($p[!$prevbrw]{Differs} & ~D_UPS)) {
 	return $classify->(qw(BreakwaterUpstreamMerge),
-			   OrigParents => [ $p[1] ]);
+			   OrigParents => [ $p[!$prevbrw] ]);
     }
     # xxx multi-.orig upstreams
 
@@ -568,13 +588,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) = @_;
@@ -659,7 +679,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';
@@ -688,6 +708,8 @@ enabledebug if $debuglevel;
 my $toplevel = cmdoutput @git, qw(rev-parse --show-toplevel);
 chdir $toplevel or die "chdir $toplevel: $!";
 
+$rd = fresh_playground "$playprefix/misc";
+
 my $cmd = shift @ARGV;
 my $cmdfn = $cmd;
 $cmdfn =~ y/-/_/;