X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=git-debrebase;h=d174fe60fbe2ba71b75c6d3e077d2d47b156b233;hb=25fa26693587f923061cc4d144297dee29eb4892;hp=7d5d5bdd72254bc0dcbac180037d0355095d58cb;hpb=297ff51a0df2098ea9fe088e229bcd1318bfe466;p=dgit.git

diff --git a/git-debrebase b/git-debrebase
index 7d5d5bdd..d174fe60 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -18,6 +18,9 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+END { $? = $Debian::Dgit::ExitStatus::desired // -1; };
+use Debian::Dgit::ExitStatus;
+
 use strict;
 
 use Debian::Dgit qw(:DEFAULT :playground);
@@ -39,7 +42,7 @@ our $us = qw(git-debrebase);
 sub badusage ($) {
     my ($m) = @_;
     print STDERR "bad usage: $m\n";
-    exit 12;
+    finish 8;
 }
 
 sub cfg ($;$) {
@@ -424,6 +427,23 @@ sub classify ($) {
 	# way also there's also an easy rune to look for the upstream
 	# patches (--topo-order).
 
+	# Also this makes --first-parent be slightly more likely to
+	# be useful - it makes it provide a linearised breakwater history.
+
+	# Of course one can say somthing like
+	#  gitk -- ':/' ':!/debian'
+	# to get _just_ the commits touching upstream files, and by
+	# the TREESAME logic in git-rev-list this will leave the
+	# breakwater into upstream at the first anchor.  But that
+	# doesn't report debian/ changes at all.
+
+	# Other observations about gitk: by default, gitk seems to
+	# produce output in a different order to git-rev-list.  I
+	# can't seem to find this documented anywhere.  gitk
+	# --date-order DTRT.  But, gitk always seems to put the
+	# parents from left to right, in order, so it's easy to see
+	# which way round a pseudomerge is.
+
 	$p[0]{IsOrigin} and $badanchor->("is an origin commit");
 	$p[1]{Differs} & ~DS_DEB and
 	    $badanchor->("upstream files differ from left parent");
@@ -1083,6 +1103,8 @@ sub stitch ($$$$$) {
 	}
     }
     fresh_workarea();
+    # We make pseudomerges with L as the contributing parent.
+    # This makes git rev-list --first-parent work properly.
     my $new_head = make_commit [ $old_head, $ffq_prev ], [
 	'Declare fast forward / record previous work',
         "[git-debrebase pseudomerge: $prose]",
@@ -1362,6 +1384,44 @@ sub make_patches_staged ($) {
     };
 }
 
+sub make_patches ($) {
+    my ($head) = @_;
+    keycommits $head, 0, \&snag;
+    make_patches_staged $head;
+    my $out;
+    in_workarea sub {
+	my $ptree = cmdoutput @git, qw(write-tree --prefix=debian/patches/);
+	runcmd @git, qw(read-tree), $head;
+	read_tree_subdir 'debian/patches', $ptree;
+	$out = make_commit [$head], [
+            'Commit patch queue (exported by git-debrebase)',
+            '[git-debrebase: export and commit patches]',
+        ];
+    };
+    my $d = get_differs $head, $out;
+    if ($d == 0) {
+	return undef; # nothing to do
+    } elsif ($d == D_PAT_ADD) {
+	return $out; # OK
+    } else {
+	fail "Patch export produced patch amendments".
+	    " (abandoned output commit $out).".
+	    "  Try laundering first.";
+    }
+}
+
+sub cmd_make_patches () {
+    badusage "no arguments allowed" if @ARGV;
+    my $old_head = get_head();
+    my $new = make_patches $old_head;
+    snags_maybe_bail();
+    if (!$new) {
+	fail "No (more) patches to export." unless $opt_noop_ok;
+	return;
+    }
+    update_head_checkout $old_head, $new, 'make-patches';
+}
+
 sub cmd_convert_from_gbp () {
     badusage "needs 1 optional argument, the upstream git rev"
 	unless @ARGV<=1;
@@ -1544,3 +1604,5 @@ if (!@ARGV || $opt_defaultcmd_interactive || $ARGV[0] =~ m{^-}) {
     $cmdfn or badusage "unknown git-debrebase sub-operation $cmd";
     $cmdfn->();
 }
+
+finish 0;