X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=git-debrebase;h=24be35e353f1c716e9a8bfb0d1463bce9f588409;hp=b51c7148e53f663251372c145953a884c2b736a1;hb=76b90289f6bbd304e35d984cebd28a1cbc14d4fe;hpb=69aae724c3d05a20219e5a9642e162dd65ef2fe9

diff --git a/git-debrebase b/git-debrebase
index b51c7148..24be35e3 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -975,6 +975,18 @@ sub update_head_postlaunder ($$$) {
     runcmd @git, qw(rm --quiet --ignore-unmatch -rf debian/patches);
 }
 
+sub currently_rebasing() {
+    foreach (qw(rebase-merge rebase-apply)) {
+	return 1 if stat_exists "$maindir_gitdir/$_";
+    }
+    return 0;
+}
+
+sub bail_if_rebasing() {
+    fail "you are in the middle of a git-rebase already"
+	if currently_rebasing();
+}
+
 sub do_launder_head ($) {
     my ($reflogmsg) = @_;
     my $old = get_head();
@@ -1114,6 +1126,7 @@ sub record_ffq_prev_deferred () {
     # if "deferred", will have added something about that to
     #   @deferred_update_messages, and also maybe printed (already)
     #   some messages about ff checks
+    bail_if_rebasing();
     my $currentval = get_head();
 
     my ($status,$message, $ffq_prev,$gdrlast) = ffq_check $currentval;
@@ -1137,6 +1150,7 @@ sub record_ffq_auto () {
 }
 
 sub ffq_prev_info () {
+    bail_if_rebasing();
     # => ($ffq_prev, $gdrlast, $ffq_prev_commitish)
     my ($status, $message, $current, $ffq_prev, $gdrlast)
 	= ffq_prev_branchinfo();
@@ -1547,6 +1561,7 @@ sub cmd_status () {
 	    print "  not git-debrebase (diverged since last stitch)\n"
 	}
     }
+    print "you are currently rebasing\n" if currently_rebasing();
 }
 
 sub cmd_stitch () {
@@ -1577,6 +1592,24 @@ sub cmd_conclude () {
     do_stitch 'quick';
 }
 
+sub cmd_scrap () {
+    if (currently_rebasing()) {
+	runcmd @git, qw(rebase --abort);
+    }
+    my ($ffq_prev, $gdrlast, $ffq_prev_commitish) = ffq_prev_info();
+    if (!$ffq_prev_commitish) {
+	fail "No ongoing git-debrebase session." unless $opt_noop_ok;
+	finish 0;
+    }
+    my $scrapping_head = get_head();
+    badusage "no arguments allowed" if @ARGV;
+    push @deferred_updates,
+	"update $gdrlast $ffq_prev_commitish $git_null_obj",
+	"update $ffq_prev $git_null_obj $ffq_prev_commitish";
+    snags_maybe_bail();
+    update_head_checkout $scrapping_head, $ffq_prev_commitish, "scrap";
+}
+
 sub make_patches_staged ($) {
     my ($head) = @_;
     # Produces the patches that would result from $head if it were
@@ -1618,6 +1651,7 @@ sub cmd_make_patches () {
     getoptions("make-patches",
 	       'quiet-would-amend!', \$opt_quiet_would_amend);
     badusage "no arguments allowed" if @ARGV;
+    bail_if_rebasing();
     my $old_head = get_head();
     my $new = make_patches $old_head;
     my $d = get_differs $old_head, $new;
@@ -1788,6 +1822,194 @@ git-debrebase: WARNING: doing so would drop all upstream patches!
 END
 }
 
+sub cmd_convert_from_dgit_view () { 
+    my $clogp = parsechangelog();
+
+    my $bpd = (cfg 'dgit.default.build-products-dir',1) // '..';
+    my $do_origs = 1;
+    my $do_tags = 1;
+    my $always = 0;
+    my $diagnose = 0;
+
+    getoptions("convert-from-dgit-view",
+	       'diagnose!', \$diagnose,
+	       'build-products-dir:s', \$bpd,
+	       'origs!', \$do_origs,
+	       'tags!', \$do_tags,
+	       'always-convert-anyway!', \$always);
+    fail "takes 1 optional argument, the upstream commitish" if @ARGV>1;
+
+    my @upstreams;
+
+    if (@ARGV) {
+	my $spec = shift @ARGV;
+	my $commit = git_rev_parse "$spec^{commit}";
+	push @upstreams, { Commit => $commit,
+			   Source => "$ARGV[0], from command line",
+			   Only => 1,
+			 };
+    }
+
+    my $head = get_head();
+
+    if (!$always) {
+	my $troubles = 0;
+	my $trouble = sub { $troubles++; };
+	keycommits $head, sub{}, sub{}, $trouble, $trouble;
+	printdebug "troubles=$troubles\n";
+	if (!$troubles) {
+	    print STDERR <<END;
+$us: Branch already seems to be in git-debrebase format!
+$us: --always-convert-anyway would do the conversion operation anyway
+$us: but is probably a bad idea.  Probably, you wanted to do nothing.
+END
+	    fail "Branch already in git-debrebase format." unless $opt_noop_ok;
+	    finish 0;
+	}
+    }
+
+    snags_maybe_bail_early();
+
+    my $version = upstreamversion $clogp->{Version};
+    print STDERR "Considering possible commits corresponding to upstream:\n";
+
+    if (!@upstreams) {
+	if ($do_tags) {
+	    my @tried;
+	    my $ups_tag = upstream_commitish_search $version, \@tried;
+	    if ($ups_tag) {
+		my $this = "git tag $tried[-1]";
+		push @upstreams, { Commit => $ups_tag,
+				   Source => $this,
+				 };
+	    } else {
+		printf STDERR
+		    " git tag: no suitable tag found (tried %s)\n",
+		    "@tried";
+	    }
+	}
+	if ($do_origs) {
+	    my $p = $clogp->{'Source'};
+	    # we do a quick check to see if there are plausible origs
+	    my $something=0;
+	    if (!opendir BPD, $bpd) {
+		die "$bpd: opendir: $!" unless $!==ENOENT;
+	    } else {
+		while ($!=0, my $f = readdir BPD) {
+		    next unless is_orig_file_of_p_v $f, $p, $version;
+		    printf STDERR
+			" orig: found what looks like a .orig, %s\n",
+			"$bpd/$f";
+		    $something=1;
+		    last;
+		}
+		die "read $bpd: $!" if $!;
+		closedir BPD;
+	    }
+	    if ($something) {
+		my $tree = cmdoutput
+		    @dgit, qw(--build-products-dir), $bpd,
+		    qw(print-unapplied-treeish);
+		fresh_workarea();
+		in_workarea sub {
+		    runcmd @git, qw(reset --quiet), $tree, qw(-- .);
+		    rm_subdir_cached 'debian';
+		    $tree = cmdoutput @git, qw(write-tree);
+		    my $ups_synth = make_commit [], [ <<END, <<END,
+Import effective orig tree for upstream version $version
+END
+This includes the contents of the .orig(s), minus any debian/ directory.
+
+[git-debrebase import-from-dgit-view upstream-import-convert: $version]
+END
+						    ];
+		    push @upstreams, { Commit => $ups_synth,
+				       Source => "orig(s) imported via dgit",
+				     };
+		}
+	    } else {
+		printf STDERR
+		    " orig: no suitable origs found (looked for %s in %s)\n",
+		    "${p}_".(stripeoch $version)."...", $bpd;
+	    }
+	}
+    }
+
+    my $some_patches = stat_exists 'debian/patches/series';
+
+    print STDERR "Evaluating possible commits corresponding to upstream:\n";
+
+    my $result;
+    foreach my $u (@upstreams) {
+	my $work = $head;
+	fresh_workarea();
+	in_workarea sub {
+	    runcmd @git, qw(reset --quiet), $u->{Commit}, qw(-- .);
+	    runcmd @git, qw(checkout), $u->{Commit}, qw(-- .);
+	    runcmd @git, qw(clean -xdff);
+	    runcmd @git, qw(checkout), $head, qw(-- debian);
+	    if ($some_patches) {
+		rm_subdir_cached 'debian/patches';
+		$work = make_commit [ $work ], [
+ 'git-debrebase convert-from-dgit-view: drop upstream changes from breakwater',
+ "Drop upstream changes, and delete debian/patches, as part of converting\n".
+ "to git-debrebase format.  Upstream changes will appear as commits.",
+ '[git-debrebase convert-from-dgit-view: drop patches from tree]'
+					   ];
+	    }
+	    $work = make_commit [ $work, $u->{Commit} ], [
+ 'git-debrebase convert-from-dgit-view: declare upstream',
+ '(Re)constructed breakwater merge.',
+ '[git-debrebase anchor: declare upstream]'
+							 ];
+	    runcmd @git, qw(checkout --quiet -b mk), $work;
+	    if ($some_patches) {
+		runcmd @git, qw(checkout), $head, qw(-- debian/patches);
+		runcmd @git, qw(reset --quiet);
+		my @gbp_cmd = (qw(gbp pq import));
+		if (!$diagnose) {
+		    my $gbp_err = "../gbp-pq-err";
+		    @gbp_cmd = shell_cmd "exec >$gbp_err 2>&1", @gbp_cmd;
+		}
+		my $r = system @gbp_cmd;
+		if ($r) {
+		    printf STDERR
+			" %s: couldn't apply patches: gbp pq %s",
+			$u->{Source}, waitstatusmsg();
+		    return;
+		}
+	    }
+	    my $work = git_rev_parse qw(HEAD);
+	    my $diffout = cmdoutput @git, qw(diff-tree --stat HEAD), $work;
+	    if (length $diffout) {
+		print STDERR
+		    " $u->{Source}: applying patches gives different tree\n";
+		print STDERR $diffout if $diagnose;
+		return;
+	    }
+	    # OMG!
+	    $u->{Result} = $work;
+	    $result = $u;
+	};
+	last if $result;
+    }
+
+    if (!$result) {
+	fail <<END;
+Could not find or construct a suitable upstream commit.
+Rerun adding --diagnose after convert-from-dgit-view, or pass a
+upstream commmit explicitly or provide suitable origs.
+END
+    }
+
+    printf STDERR "Yes, will base new branch on %s\n", $result->{Source};
+
+    ffq_check $result->{Result};
+    snags_maybe_bail();
+    update_head_checkout $head, $result->{Result},
+	'convert-from-dgit-view';
+}
+
 sub cmd_downstream_rebase_launder_v0 () {
     badusage "needs 1 argument, the baseline" unless @ARGV==1;
     my ($base) = @ARGV;