X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=git-debrebase;h=36f73d70e75767a381d605b59a8285bbbfa26585;hb=91f6d93d44a430cb206457e356f70eda18f714a0;hp=c273976cc3448885e834b2e9c269778114d6d7dd;hpb=e66c2cf3f7182a3e6f52945636a807ed4a959d5b;p=dgit.git

diff --git a/git-debrebase b/git-debrebase
index c273976c..36f73d70 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -50,11 +50,9 @@ usages:
 See git-debrebase(1), git-debrebase(5), dgit-maint-debrebase(7) (in dgit).
 END
 
-our ($opt_force, $opt_careful, $opt_noop_ok, @opt_anchors);
+our ($opt_force, $opt_noop_ok, @opt_anchors);
 our ($opt_defaultcmd_interactive);
 
-$opt_careful = 0;
-
 our $us = qw(git-debrebase);
 
 our $wrecknoteprefix = 'refs/debrebase/wreckage';
@@ -183,23 +181,30 @@ sub run_deferred_updates ($) {
     @deferred_update_messages = ();
 }
 
-sub get_tree ($) {
+sub get_tree ($;$$) {
     # tree object name => ([ $name, $info ], ...)
     # where $name is the sort key, ie has / at end for subtrees
     # $info is the LHS from git-ls-tree (<mode> <type> <hash>)
-    # will crash if $x does not exist, so don't do that;
+    # without $precheck, will crash if $x does not exist, so don't do that;
     # instead pass '' to get ().
-    my ($x) = @_;
+    my ($x, $precheck, $recurse) = @_;
 
     return () if !length $x;
 
+    if ($precheck) {
+	my ($type, $dummy) = git_cat_file $x, [qw(tree missing)];
+	return () if $type eq 'missing';
+    }
+
     our (@get_tree_memo, %get_tree_memo);
     my $memo = $get_tree_memo{$x};
     return @$memo if $memo;
 
     local $Debian::Dgit::debugcmd_when_debuglevel = 3;
     my @l;
-    my @cmd = (qw(git ls-tree -z --full-tree --), $x);
+    my @cmd = (qw(git ls-tree -z --full-tree));
+    push @cmd, qw(-r) if $recurse;
+    push @cmd, qw(--), $x;
     my $o = cmdoutput @cmd;
     $o =~ s/\0$//s;
     my $last = '';
@@ -439,11 +444,7 @@ sub gbp_pq_export ($$$) {
 }
 
 
-# xxx allow merge resolution separately from laundering, before git merge
-#
-# xxx general gdr docs highlight forbidden things
-# xxx general gdr docs list allowable things ?
-# xxx general gdr docs explicitly forbid some rebase
+# MERGE-TODO allow merge resolution separately from laundering, before git merge
 
 # later/rework?
 #  use git-format-patch?
@@ -975,7 +976,6 @@ sub classify ($) {
 
     if (@p == 2 and
 	$r->{Msg} =~ m{^\[git-debrebase merged-breakwater.*\]$}m) {
-	# xxx ^ metadata tag needs adding to (5)
 	return $classify->("MergedBreakwaters");
     }
     if ($r->{Msg} =~ m{^\[(git-debrebase|dgit)[: ].*\]$}m) {
@@ -1306,7 +1306,7 @@ sub walk ($;$$$) {
 	    # which was reachable via ffq-prev is no longer findable.
 	    # This is suboptimal, but if it all works we'll have done
 	    # the right thing.
-	    # xxx we should warn the user in the docs about this
+	    # MERGE-TODO we should warn the user in the docs about this
 
 	    my $ok=1;
 	    my $best_anchor;
@@ -1598,7 +1598,7 @@ sub walk ($;$$$) {
 		    printdebug "WALK REWRITING NOW cl=$cl procd=$procd\n";
 		}
 	    }
-	    if ($rewriting || $opt_careful) {
+	    if ($rewriting) {
 		read_tree_upstream $want_upstream, 0, $want_debian;
 
 		my $newtree = cmdoutput @git, qw(write-tree);
@@ -1672,7 +1672,7 @@ sub update_head_checkout ($$$) {
 
 sub update_head_postlaunder ($$$) {
     my ($old, $tip, $reflogmsg) = @_;
-    return if $tip eq $old;
+    return if $tip eq $old && !@deferred_updates;
     print "git-debrebase: laundered (head was $old)\n";
     update_head $old, $tip, $reflogmsg;
     # no tree changes except debian/patches
@@ -2383,6 +2383,24 @@ sub cmd_make_patches () {
     }
 }
 
+sub check_series_has_all_patches ($) {
+    my ($head) = @_;
+    my $seriesfn = 'debian/patches/series';
+    my ($dummy, $series) = git_cat_file "$head:$seriesfn",
+	[qw(blob missing)];
+    $series //= '';
+    my %series;
+    foreach my $f (grep /\S/, grep {!m/^\s\#/} split /\n/, $series) {
+	fail "patch $f repeated in $seriesfn !" if $series{$f}++;
+    }
+    foreach my $patchfile (get_tree "$head:debian/patches", 1,1) {
+	my ($f,$i) = @$patchfile;
+	next if $series{$f};
+	next if $f eq 'series';
+	snag 'unused-patches', "Unused patch file $f will be discarded";
+    }
+}
+
 sub cmd_convert_from_gbp () {
     badusage "want only 1 optional argument, the upstream git commitish"
 	unless @ARGV<=1;
@@ -2430,6 +2448,8 @@ END
 	    "upstream ($upstream) contains debian/ directory";
     }
 
+    check_series_has_all_patches $old_head;
+
     my $previous_dgit_view = eval {
 	my @clogcmd = qw(dpkg-parsechangelog --format rfc822 -n2);
 	my ($lvsn, $suite);
@@ -2450,19 +2470,25 @@ END
 	my $mtag = cmdoutput @git, qw(describe --always --abbrev=0 --match),
 	    $mtag_pat;
 	die "could not find suitable maintainer view tag $mtag_pat\n"
-	    unless $mtag_pat =~ m{/};
+	    unless $mtag =~ m{/};
 	is_fast_fwd $mtag, 'HEAD' or
 	    die "HEAD is not FF from maintainer tag $mtag!";
 	my $dtag = "archive/$mtag";
+	git_get_ref "refs/tags/$dtag" or
+	    die "dgit view tag $dtag not found\n";
 	is_fast_fwd $mtag, $dtag or
-	    die "dgit view tag $dtag is not FF from maintainer tag $mtag";
+	    die "dgit view tag $dtag is not FF from maintainer tag $mtag\n";
 	print "will stitch in dgit view, $dtag\n";
 	git_rev_parse $dtag;
     };
     if (!$previous_dgit_view) {
 	$@ =~ s/^\n+//;
 	chomp $@;
-	print STDERR "cannot stitch in dgit view: $@\n";
+	print STDERR <<END;
+Cannot confirm dgit view: $@
+Failed to stitch in dgit view (see messages above).
+dgit --overwrite will be needed on the first dgit push after conversion.
+END
     }
 
     snags_maybe_bail_early();
@@ -2506,6 +2532,9 @@ END
     ffq_check $work;
     snags_maybe_bail();
     update_head_checkout $old_head, $work, 'convert-from-gbp';
+    print <<END or die $!;
+git-debrebase: converted from patched-unapplied (gbp) branch format, OK
+END
 }
 
 sub cmd_convert_to_gbp () {
@@ -2580,6 +2609,8 @@ END
 	}
     }
 
+    check_series_has_all_patches $head;
+
     snags_maybe_bail_early();
 
     my $version = upstreamversion $clogp->{Version};
@@ -2724,7 +2755,7 @@ END
 
 sub cmd_record_resolved_merge () {
     badusage "record-resolved-merge takes no further arguments" if @ARGV;
-    # xxx needs documentation
+    # MERGE-TODO needs documentation
     my $new = get_head();
     my $method;