X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=git-debrebase;h=13ca472d47881b34361a8c4dc160bc0113d0f47c;hp=3449ec3950ad98064baf6b0736455dfa76c456f9;hb=fcff4f4b403b6dd53d6bc6b10d56baccd83dd144;hpb=0d90164505d26f733fde2482616ddbf18f782145

diff --git a/git-debrebase b/git-debrebase
index 3449ec39..13ca472d 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -45,10 +45,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";
@@ -1162,24 +1168,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;
-
-    # 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_version = $new_version->version();
+    my $new_upstream_version = "$version";
+    $new_upstream_version =~ s/-.*?$//;;
 
-    my $new_upstream = shift @ARGV;
     if (!defined $new_upstream) {
 	my @tried;
 	# todo: at some point maybe use git-deborig to do this
@@ -1197,6 +1191,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 {
@@ -1506,7 +1524,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;
 }
@@ -1569,8 +1588,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;
@@ -1592,19 +1611,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 <<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) {
@@ -1779,7 +1809,8 @@ sub cmd_downstream_rebase_launder_v0 () {
     }
 }
 
-GetOptions("D+" => \$debuglevel,
+getoptions("bad options\n",
+	   "D+" => \$debuglevel,
 	   'noop-ok', => \$opt_noop_ok,
 	   'f=s' => \@snag_force_opts,
 	   'anchor=s' => \@opt_anchors,
@@ -1795,7 +1826,8 @@ GetOptions("D+" => \$debuglevel,
 	       # approach.  '-i=s{0,}' does not work with bundling.
 	       push @$opt_defaultcmd_interactive, @ARGV;
 	       @ARGV=();
-	   }) or badusage "bad options\n";
+	   });
+
 initdebug('git-debrebase ');
 enabledebug if $debuglevel;