X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=git-debrebase;h=b61970ce2f57bbef33a8915334a12a73e0272d28;hp=07e5f478cac58281570da99ef27e57953c0a6a53;hb=8bfc1691211b345c319eed386e0442e1f579726a;hpb=3028f34f1868b3726f856ede688437b5279c2b05 diff --git a/git-debrebase b/git-debrebase index 07e5f478..b61970ce 100755 --- a/git-debrebase +++ b/git-debrebase @@ -36,6 +36,18 @@ use Dpkg::Version; use File::FnMatch qw(:fnmatch); use File::Copy; +our ($usage_message) = <<'END'; +usages: + git-debrebase [] [--|-i ] + git-debrebase [] status + git-debrebase [] prepush [--prose=...] + git-debrebase [] quick|conclude + git-debrebase [] new-upstream [
] + git-debrebase [] convert-from-gbp [] + ... +See git-debrebase(1), git-debrebase(5), dgit-maint-debrebase(7) (in dgit). +END + our ($opt_force, $opt_noop_ok, @opt_anchors); our ($opt_defaultcmd_interactive); @@ -45,10 +57,16 @@ $|=1; sub badusage ($) { my ($m) = @_; - print STDERR "bad usage: $m\n"; + print STDERR "$us: bad usage: $m\n"; finish 8; } +sub getoptions { + my $m = shift; + local $SIG{__WARN__}; # GetOptions calls `warn' to print messages + GetOptions @_ or badusage $m; +} + sub cfg ($;$) { my ($k, $optional) = @_; local $/ = "\0"; @@ -573,7 +591,7 @@ sub keycommits ($;$$$$) { my ($anchor, $breakwater); my $clogonly; my $cl; - $fatal //= sub { fail $_[2]; }; + $fatal //= sub { fail $_[1]; }; my $x = sub { my ($cb, $tagsfx, $mainwhy, $xwhy) = @_; my $why = $mainwhy.$xwhy; @@ -679,10 +697,11 @@ sub walk ($;$$) { if ($nogenerate) { return (undef,undef); } - die "commit $cur: Cannot cope with this commit (d.". + fail "found unprocessable commit, cannot cope:". + (defined $cl->{Why} ? "; $cl->{Why}": ''). + " (commit $cur) (d.". (join ' ', map { sprintf "%#x", $_->{Differs} } @{ $cl->{Parents} }). - (defined $cl->{Why} ? "; $cl->{Why}": ''). ")"; }; @@ -1161,23 +1180,12 @@ sub do_stitch ($;$) { stitch($dangling_head, $ffq_prev, $gdrlast, $ffq_prev_commitish, $prose); } -sub cmd_new_upstream () { - # automatically and unconditionally launders before rebasing - # if rebase --abort is used, laundering has still been done +sub resolve_upstream_version ($$) { + my ($new_upstream, $version) = @_; - my %pieces; - - badusage "need NEW-VERSION [UPS-COMMITTISH]" unless @ARGV >= 1; + my $new_upstream_version = "$version"; + $new_upstream_version =~ s/-.*?$//;; - # parse args - low commitment - my $spec_version = shift @ARGV; - my $new_version = (new Dpkg::Version $spec_version, check => 1); - if ($new_version->is_native()) { - $new_version = (new Dpkg::Version "$spec_version-1", check => 1); - } - my $new_upstream_version = $new_version->version(); - - my $new_upstream = shift @ARGV; if (!defined $new_upstream) { my @tried; # todo: at some point maybe use git-deborig to do this @@ -1195,6 +1203,30 @@ sub cmd_new_upstream () { } $new_upstream = git_rev_parse $new_upstream; + return ($new_upstream, $new_upstream_version); +} + +sub cmd_new_upstream () { + # automatically and unconditionally launders before rebasing + # if rebase --abort is used, laundering has still been done + + my %pieces; + + badusage "need NEW-VERSION [UPS-COMMITTISH]" unless @ARGV >= 1; + + # parse args - low commitment + my $spec_version = shift @ARGV; + my $new_version = (new Dpkg::Version $spec_version, check => 1); + fail "bad version number \`$spec_version'" unless defined $new_version; + if ($new_version->is_native()) { + $new_version = (new Dpkg::Version "$spec_version-1", check => 1); + } + + my $new_upstream = shift @ARGV; + my $new_upstream_version; + ($new_upstream, $new_upstream_version) = + resolve_upstream_version $new_upstream, $new_version; + record_ffq_auto(); my $piece = sub { @@ -1504,7 +1536,8 @@ sub cmd_status () { sub cmd_stitch () { my $prose = 'stitch'; - GetOptions('prose=s', \$prose) or badusage("bad options to stitch"); + getoptions("bad options follow \`git-debrebase stitch'", + 'prose=s', \$prose); badusage "no arguments allowed" if @ARGV; do_stitch $prose, 0; } @@ -1567,8 +1600,8 @@ sub make_patches ($) { sub cmd_make_patches () { my $opt_quiet_would_amend; - GetOptions('quiet-would-amend!', \$opt_quiet_would_amend) - or badusage("bad options to make-patches"); + getoptions("bad options follow \`git-debrebase make-patches'", + 'quiet-would-amend!', \$opt_quiet_would_amend); badusage "no arguments allowed" if @ARGV; my $old_head = get_head(); my $new = make_patches $old_head; @@ -1590,19 +1623,30 @@ sub cmd_make_patches () { } sub cmd_convert_from_gbp () { - badusage "needs 1 optional argument, the upstream git rev" + badusage "want only 1 optional argument, the upstream git commitish" unless @ARGV<=1; + + my $clogp = parsechangelog(); + my $version = $clogp->{'Version'} + // die "missing Version from changelog"; + my ($upstream_spec) = @ARGV; - $upstream_spec //= 'refs/heads/upstream'; - my $upstream = git_rev_parse $upstream_spec; + + my ($upstream, $upstream_version) = + resolve_upstream_version($upstream_spec, $version); + my $old_head = get_head(); my $upsdiff = get_differs $upstream, $old_head; if ($upsdiff & D_UPS) { - runcmd @git, qw(--no-pager diff), + runcmd @git, qw(--no-pager diff --stat), $upstream, $old_head, qw( -- :!/debian :/); - fail "upstream ($upstream_spec) and HEAD are not identical in upstream files"; + fail < \$debuglevel, +getoptions("bad options\n", + "D+" => \$debuglevel, 'noop-ok', => \$opt_noop_ok, 'f=s' => \@snag_force_opts, 'anchor=s' => \@opt_anchors, @@ -1793,7 +1838,10 @@ GetOptions("D+" => \$debuglevel, # approach. '-i=s{0,}' does not work with bundling. push @$opt_defaultcmd_interactive, @ARGV; @ARGV=(); - }) or badusage "bad options\n"; + }, + 'help' => sub { print $usage_message or die $!; finish 0; }, + ); + initdebug('git-debrebase '); enabledebug if $debuglevel;