X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=git-debrebase;h=35284d52ed8391436aed027f18e7cb9e089ef82b;hb=3e041f7eae8fcac38d485e17df481b9b0aeef9b8;hp=2687ef1f6873240c22feb16df93621328841c809;hpb=c83cc428208bee99de3b75158b9779449403ee1b;p=dgit.git

diff --git a/git-debrebase b/git-debrebase
index 2687ef1f..35284d52 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 [<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);
 
@@ -45,10 +57,20 @@ $|=1;
 
 sub badusage ($) {
     my ($m) = @_;
-    print STDERR "bad usage: $m\n";
+    print STDERR "$us: bad usage: $m\n";
     finish 8;
 }
 
+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) = @_;
     local $/ = "\0";
@@ -1162,21 +1184,23 @@ sub do_stitch ($;$) {
     stitch($dangling_head, $ffq_prev, $gdrlast, $ffq_prev_commitish, $prose);
 }
 
-sub resolve_upstream_version ($$) {
-    my ($new_upstream, $version) = @_;
+sub upstream_commitish_search ($$) {
+    my ($upstream_version, $tried) = @_;
+    # todo: at some point maybe use git-deborig to do this
+    foreach my $tagpfx ('', 'v', 'upstream/') {
+	my $tag = $tagpfx.(dep14_version_mangle $upstream_version);
+	my $new_upstream = git_get_ref "refs/tags/$tag";
+	return $new_upstream if length $new_upstream;
+	push @$tried, $tag;
+    }
+}
 
-    my $new_upstream_version = "$version";
-    $new_upstream_version =~ s/-.*?$//;;
+sub resolve_upstream_version ($$) {
+    my ($new_upstream, $upstream_version) = @_;
 
     if (!defined $new_upstream) {
 	my @tried;
-	# todo: at some point maybe use git-deborig to do this
-	foreach my $tagpfx ('', 'v', 'upstream/') {
-	    my $tag = $tagpfx.(dep14_version_mangle $new_upstream_version);
-	    $new_upstream = git_get_ref "refs/tags/$tag";
-	    last if length $new_upstream;
-	    push @tried, $tag;
-	}
+	$new_upstream = upstream_commitish_search $upstream_version, \@tried;
 	if (!length $new_upstream) {
 	    fail "Could not determine appropriate upstream commitish.\n".
 		" (Tried these tags: @tried)\n".
@@ -1185,7 +1209,7 @@ sub resolve_upstream_version ($$) {
     }
     $new_upstream = git_rev_parse $new_upstream;
 
-    return ($new_upstream, $new_upstream_version);
+    return $new_upstream;
 }
 
 sub cmd_new_upstream () {
@@ -1205,9 +1229,9 @@ sub cmd_new_upstream () {
     }
 
     my $new_upstream = shift @ARGV;
-    my $new_upstream_version;
-    ($new_upstream, $new_upstream_version) =
-	resolve_upstream_version $new_upstream, $new_version;
+    my $new_upstream_version = upstreamversion  $new_version;
+    $new_upstream =
+	resolve_upstream_version $new_upstream, $new_upstream_version;
 
     record_ffq_auto();
 
@@ -1518,7 +1542,8 @@ sub cmd_status () {
 
 sub cmd_stitch () {
     my $prose = 'stitch';
-    GetOptions('prose=s', \$prose) or badusage("bad options to stitch");
+    getoptions("stitch",
+	       'prose=s', \$prose);
     badusage "no arguments allowed" if @ARGV;
     do_stitch $prose, 0;
 }
@@ -1581,8 +1606,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("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;
@@ -1613,17 +1638,22 @@ sub cmd_convert_from_gbp () {
 
     my ($upstream_spec) = @ARGV;
 
-    my ($upstream, $upstream_version) =
-	resolve_upstream_version($upstream_spec, $version);
+    my $upstream_version = upstreamversion $version;
+    my $upstream =
+	resolve_upstream_version($upstream_spec, $upstream_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 <<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) {
@@ -1798,7 +1828,9 @@ sub cmd_downstream_rebase_launder_v0 () {
     }
 }
 
-GetOptions("D+" => \$debuglevel,
+getoptions_main
+          ("bad options\n",
+	   "D+" => \$debuglevel,
 	   'noop-ok', => \$opt_noop_ok,
 	   'f=s' => \@snag_force_opts,
 	   'anchor=s' => \@opt_anchors,
@@ -1814,7 +1846,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;