use File::FnMatch qw(:fnmatch);
use File::Copy;
+our ($usage_message) = <<'END';
+usages:
+ git-debrebase [<options>] [--|-i <git rebase options...>]
+ git-debrebase [<options>] status
+ git-debrebase [<options>] prepush [--prose=...]
+ git-debrebase [<options>] quick|conclude
+ git-debrebase [<options>] new-upstream <new-version> [<details ...>]
+ git-debrebase [<options>] convert-from-gbp [<upstream-commitish>]
+ ...
+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);
finish 8;
}
-sub getoptions {
+sub getoptions_main {
my $m = shift;
local $SIG{__WARN__}; # GetOptions calls `warn' to print messages
GetOptions @_ or badusage $m;
}
+sub getoptions {
+ my $sc = shift;
+ getoptions_main "bad options follow \`git-debrebase $sc'", @_;
+}
sub cfg ($;$) {
my ($k, $optional) = @_;
sub cmd_stitch () {
my $prose = 'stitch';
- getoptions("bad options follow \`git-debrebase stitch'",
+ getoptions("stitch",
'prose=s', \$prose);
badusage "no arguments allowed" if @ARGV;
do_stitch $prose, 0;
sub cmd_make_patches () {
my $opt_quiet_would_amend;
- getoptions("bad options follow \`git-debrebase make-patches'",
+ getoptions("make-patches",
'quiet-would-amend!', \$opt_quiet_would_amend);
badusage "no arguments allowed" if @ARGV;
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 <<END;
+upstream ($upstream_spec) and HEAD are not
+identical in upstream files. See diffstat above, or run
+ git diff $upstream_spec HEAD -- :!/debian :/
+END
}
if (!is_fast_fwd $upstream, $old_head) {
}
}
-getoptions("bad options\n",
+getoptions_main
+ ("bad options\n",
"D+" => \$debuglevel,
'noop-ok', => \$opt_noop_ok,
'f=s' => \@snag_force_opts,
# approach. '-i=s{0,}' does not work with bundling.
push @$opt_defaultcmd_interactive, @ARGV;
@ARGV=();
- });
+ },
+ 'help' => sub { print $usage_message or die $!; finish 0; },
+ );
initdebug('git-debrebase ');
enabledebug if $debuglevel;