X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=git-debrebase;h=2b6584630516bb3208c0874413c1bbe791168f94;hp=cc51f775889c2e987e7c0f209721fc8d4b7f1fe4;hb=4f22209a590da904276c3a52643473f44cc22d18;hpb=971d00a91614c91d96413d0d17dee531b3ed0935

diff --git a/git-debrebase b/git-debrebase
index cc51f775..2b658463 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -111,7 +111,8 @@ sub cfg ($;$) {
 	fail "missing required git config $k" unless $optional;
 	return ();
     }
-    return split /\0/, $out;
+    my @l = split /\0/, $out;
+    return wantarray ? @l : $l[0];
 }
 
 memoize('cfg');
@@ -450,15 +451,24 @@ sub classify ($) {
 			   Contributor => $identical[0]);
     }
     if (@p == 2 && @identical == 2) {
-	my @bytime = nsort_by {
-	    my ($ph,$pm) = get_commit $_->{CommitId};
+	my $get_t = sub {
+	    my ($ph,$pm) = get_commit $_[0]{CommitId};
 	    $ph =~ m/^committer .* (\d+) [-+]\d+$/m or die "$_->{CommitId} ?";
 	    $1;
-	} @p;
+	};
+	my @bytime = @p;
+	my $order = $get_t->($bytime[0]) <=> $get_t->($bytime[1]);
+	if ($order > 0) { # newer first
+	} elsif ($order < 0) {
+	    @bytime = reverse @bytime;
+	} else {
+	    # same age, default to order made by -s ours
+	    # that is, commit was made by someone who preferred L
+	}
 	return $classify->(qw(Pseudomerge),
 			   SubType => qw(Ambiguous),
-			   Overwritten => [ $bytime[0] ],
-			   Contributor => $bytime[1]);
+			   Contributor => $bytime[0],
+			   Overwritten => [ $bytime[1] ]);
     }
     foreach my $p (@p) {
 	my ($p_h, $p_m) = get_commit $p->{CommitId};
@@ -590,13 +600,16 @@ sub walk ($;$$) {
 
     my $bomb = sub { # usage: return $bomb->();
 	print $report " Unprocessable" if $report;
+	print $report " ($cl->{Why})" if $report && defined $cl->{Why};
 	$prprdelim->();
 	if ($nogenerate) {
 	    return (undef,undef);
 	}
 	die "commit $cur: Cannot cope with this commit (d.".
 	    (join ' ', map { sprintf "%#x", $_->{Differs} }
-	     @{ $cl->{Parents} }). ")";
+	     @{ $cl->{Parents} }).
+	    (defined $cl->{Why} ? "; $cl->{Why}": '').
+		 ")";
     };
 
     my $build;
@@ -902,6 +915,7 @@ sub ffq_prev_branchinfo () {
     return ('weird-symref', 'HEAD symref is not to refs/')
 	unless $current =~ m{^refs/};
     my $ffq_prev = "refs/$ffq_refprefix/$'";
+    printdebug "ffq_prev_branchinfo branch current $current\n";
     return ('branch', undef, $current, $ffq_prev);
 }
 
@@ -931,12 +945,15 @@ sub record_ffq_prev () {
     my @check_specs = split /\;/, (cfg "branch.$branch.ffq-ffrefs",1) // '*';
     my %checked;
 
+    printdebug "ffq check_specs @check_specs\n";
+
     my $check = sub {
 	my ($lrref, $desc) = @_;
+	printdebug "ffq might check $lrref ($desc)\n";
 	my $invert;
 	for my $chk (@check_specs) {
 	    my $glob = $chk;
-	    $invert = $glob =~ s{^[^!]}{};
+	    $invert = $glob =~ s{^[!^]}{};
 	    last if fnmatch $glob, $lrref;
 	}
 	return if $invert;
@@ -946,7 +963,7 @@ sub record_ffq_prev () {
 	if (is_fast_fwd $lrval, $currentval) {
 	    print "OK, you are ahead of $lrref\n" or die $!;
 	    $checked{$lrref} = 1;
-	} if (is_fast_fwd $currentval, $lrval) {
+	} elsif (is_fast_fwd $currentval, $lrval) {
 	    $checked{$lrref} = -1;
 	    fproblem 'behind', "you are behind $lrref, divergence risk";
 	} else {
@@ -956,23 +973,25 @@ sub record_ffq_prev () {
     };
 
     my $merge = cfg "branch.$branch.merge",1;
-    if (defined $merge && $merge =~ m{^refs/heads/}) {
+    if (defined $merge and $merge =~ m{^refs/heads/}) {
 	my $rhs = $';
+	printdebug "ffq merge $rhs\n";
 	my $check_remote = sub {
-	    my ($remote, $desc) = (@_);
+	    my ($remote, $desc) = @_;
+	    printdebug "ffq check_remote ".($remote//'undef')." $desc\n";
 	    return unless defined $remote;
 	    $check->("refs/remotes/$remote/$rhs", $desc);
 	};
-	$check_remote->((cfg "branch.$branch.remote",1),
+	$check_remote->((scalar cfg "branch.$branch.remote",1),
 			'remote fetch/merge branch');
-	$check_remote->((cfg "branch.$branch.pushRemote",1) //
-			(cfg "branch.$branch.pushDefault",1),
+	$check_remote->((scalar cfg "branch.$branch.pushRemote",1) //
+			(scalar cfg "branch.$branch.pushDefault",1),
 			'remote push branch');
     }
     if ($branch =~ m{^dgit/}) {
-	$check->("remotes/dgit/$branch", 'remote dgit branch');
+	$check->("refs/remotes/dgit/$branch", 'remote dgit branch');
     } elsif ($branch =~ m{^master$}) {
-	$check->("remotes/dgit/dgit/sid", 'remote dgit branch for sid');
+	$check->("refs/remotes/dgit/dgit/sid", 'remote dgit branch for sid');
     }
 
     fproblems_maybe_bail();