X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=git-debrebase;h=39f79cd5f92cd7aa637e1e2313931e9306922fe0;hb=05b0c33bc4b28f2b0e105c9d72dd861a233d0d6e;hp=4756748adaf58b9853166982d16763a452a5ad97;hpb=7bd28223f931fa3f36760e73c4e32673ca7f3cbe;p=dgit.git

diff --git a/git-debrebase b/git-debrebase
index 4756748a..39f79cd5 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -21,6 +21,7 @@
 END { $? = $Debian::Dgit::ExitStatus::desired // -1; };
 use Debian::Dgit::GDR;
 use Debian::Dgit::ExitStatus;
+use Debian::Dgit::I18n;
 
 use strict;
 
@@ -30,6 +31,7 @@ setup_sigwarn();
 use Memoize;
 use Carp;
 use POSIX;
+use Locale::gettext;
 use Data::Dumper;
 use Getopt::Long qw(:config posix_default gnu_compat bundling);
 use Dpkg::Version;
@@ -103,7 +105,7 @@ sub dd ($) {
 sub get_commit ($) {
     my ($objid) = @_;
     my $data = (git_cat_file $objid, 'commit');
-    $data =~ m/(?<=\n)\n/ or die "$objid ($data) ?";
+    $data =~ m/(?<=\n)\n/ or confess "$objid ($data) ?";
     return ($`,$');
 }
 
@@ -142,10 +144,10 @@ sub run_ref_updates_now ($$) {
 
     my @upd_cmd = (git_update_ref_cmd "debrebase: $mrest", qw(--stdin));
     debugcmd '>|', @upd_cmd;
-    open U, "|-", @upd_cmd or die $!;
+    open U, "|-", @upd_cmd or confess $!;
     foreach (@$updates) {
 	printdebug ">= ", $_, "\n";
-	print U $_, "\n" or die $!;
+	print U $_, "\n" or confess $!;
     }
     printdebug ">\$\n";
     close U or failedcmd @upd_cmd;
@@ -606,17 +608,17 @@ sub merge_series ($$$;@) {
 	    my $any = gbp_pq_export "p-$s", $q->{SeriesBase}, $q->{SeriesTip};
 	    my @earlier;
 	    if ($any) {
-		open S, $seriesfile or die "$seriesfile $!";
+		open S, $seriesfile or confess "$seriesfile $!";
 		while (my $patch = <S>) {
-		    chomp $patch or die $!;
+		    chomp $patch or confess $!;
 		    $prereq{$patch} //= {};
 		    foreach my $earlier (@earlier) {
-			$prereq{$patch}{$earlier}{$s}++ and die;
+			$prereq{$patch}{$earlier}{$s}++ and confess;
 		    }
 		    push @earlier, $patch;
-		    stat "debian/patches/$patch" or die "$patch ?";
+		    stat "debian/patches/$patch" or confess "$patch ?";
 		}
-		S->error and die "$seriesfile $!";
+		S->error and confess "$seriesfile $!";
 		close S;
 	    }
 	    read_tree_upstream $newbase, 1;
@@ -695,7 +697,7 @@ sub merge_series ($$$;@) {
 	my $authordate = sub {
 	    my ($f) = @_;
 	    $authordate{$f} //= do {
-		open PF, "<", "debian/patches/$f" or die "$f $!";
+		open PF, "<", "debian/patches/$f" or confess "$f $!";
 		while (<PF>) {
 		    return $nodate if m/^$/;
 		    last if s{^Date: }{};
@@ -705,7 +707,7 @@ sub merge_series ($$$;@) {
 	    };
 	};
 
-	open NS, '>', $seriesfile or die $!;
+	open NS, '>', $seriesfile or confess $!;
 
 	while (keys %prereq) {
 	    my $best;
@@ -720,7 +722,7 @@ sub merge_series ($$$;@) {
 		$best = $try;
 	    }
 	    printdebug "merge_series series next $best\n";
-	    print NS "$best\n" or die $!;
+	    print NS "$best\n" or confess $!;
 	    delete $prereq{$best};
 	    foreach my $gp (values %prereq) {
 		delete $gp->{$best};
@@ -762,9 +764,9 @@ sub merge_series_patchqueue_convert ($$$) {
 	    my $tree = cmdoutput @git, qw(write-tree);
 	    $commit =~ s{^parent (\S+)$}{parent $build}m or confess;
 	    $commit =~ s{^tree (\S+)$}{tree $tree}m      or confess;
-	    open C, ">", "../mcommit" or die $!;
-	    print C $commit or die $!;
-	    close C or die $!;
+	    open C, ">", "../mcommit" or confess $!;
+	    print C $commit or confess $!;
+	    close C or confess $!;
 	    $build = cmdoutput @git, qw(hash-object -w -t commit ../mcommit);
 	}
 	$result = $build;
@@ -835,11 +837,11 @@ sub parsecommit ($;$) {
     #    $p_ref, if provided, must be [] and is used as a base for Parents
 
     $p_ref //= [];
-    die if @$p_ref;
+    confess if @$p_ref;
 
     my ($h,$m) = get_commit $objid;
 
-    my ($t) = $h =~ m/^tree (\w+)$/m or die $objid;
+    my ($t) = $h =~ m/^tree (\w+)$/m or confess $objid;
     my (@ph) = $h =~ m/^parent (\w+)$/mg;
 
     my $r = {
@@ -1009,7 +1011,8 @@ sub classify ($) {
     if (@p == 2 && @identical == 2) {
 	my $get_t = sub {
 	    my ($ph,$pm) = get_commit $_[0]{CommitId};
-	    $ph =~ m/^committer .* (\d+) [-+]\d+$/m or die "$_->{CommitId} ?";
+	    $ph =~ m/^committer .* (\d+) [-+]\d+$/m
+		or confess "$_->{CommitId} ?";
 	    $1;
 	};
 	my @bytime = @p;
@@ -1358,7 +1361,7 @@ sub walk ($;$$$) {
 		$cl->{Why} = "bare dgit dsc import";
 		return $bomb->();
 	    }
-	    die "$ty ?";
+	    confess "$ty ?";
 	} elsif ($ty eq 'MergedBreakwaters') {
 	    $last_anchor = mergedbreakwaters_anchor $cl;
 	    $build_start->(' MergedBreakwaters', $cur);
@@ -1569,7 +1572,7 @@ sub walk ($;$$$) {
     confess "internal error" unless $build eq (pop @processed)->{CommitId};
 
     in_workarea sub {
-	mkdir $rd or $!==EEXIST or die $!;
+	mkdir $rd or $!==EEXIST or confess $!;
 	my $current_method;
 	my $want_debian = $build;
 	my $want_upstream = $build;
@@ -1679,9 +1682,9 @@ sub walk ($;$$$) {
 			or confess "$ch ?";
 		}
 		my $cf = "$rd/m$rewriting";
-		open CD, ">", $cf or die $!;
-		print CD $ch, "\n", $cl->{Msg} or die $!;
-		close CD or die $!;
+		open CD, ">", $cf or confess $!;
+		print CD $ch, "\n", $cl->{Msg} or confess $!;
+		close CD or confess $!;
 		my @cmd = (@git, qw(hash-object));
 		push @cmd, qw(-w) if $rewriting;
 		push @cmd, qw(-t commit), $cf;
@@ -1711,7 +1714,7 @@ sub walk ($;$$$) {
     };
 
     my $final_check = get_differs $build, $input;
-    die sprintf "internal error %#x %s %s", $final_check, $input, $build
+    confess sprintf "internal error %#x %s %s", $final_check, $input, $build
 	if $final_check & ~D_PAT_ADD;
 
     my @r = ($build, $breakwater, $last_anchor);
@@ -1794,7 +1797,7 @@ sub cmd_analyse () {
 	$old = git_rev_parse 'HEAD';
     }
     my ($dummy,$breakwater) = walk $old, 1,*STDOUT;
-    STDOUT->error and die $!;
+    STDOUT->error and confess $!;
 }
 
 sub ffq_check ($;$$) {
@@ -1811,7 +1814,7 @@ sub ffq_check ($;$$) {
     # normally $currentval should be HEAD
     my ($currentval, $ff, $notff) =@_;
 
-    $ff //= sub { print $_[0] or die $!; };
+    $ff //= sub { print $_[0] or confess $!; };
     $notff //= \&snag;
 
     my ($status, $message, $current, $ffq_prev, $gdrlast)
@@ -2050,7 +2053,7 @@ sub cmd_new_upstream () {
             unless @ARGV && $ARGV[0] !~ m{^-};
 
 	my $c = git_rev_parse shift @ARGV;
-	die unless $n =~ m/^$extra_orig_namepart_re$/;
+	confess unless $n =~ m/^$extra_orig_namepart_re$/;
 	$newpiece->($n, New => $c);
     }
 
@@ -2064,7 +2067,7 @@ sub cmd_new_upstream () {
     my $old_upstream;
     if (!$old_anchor_cl->{OrigParents}) {
 	snag 'anchor-treated',
-	    'old anchor is recognised due to --anchor, cannot check upstream';
+ __ 'old anchor is recognised due to --anchor, cannot check upstream';
     } else {
 	$old_upstream = parsecommit
 	    $old_anchor_cl->{OrigParents}[0]{CommitId};
@@ -2170,30 +2173,39 @@ sub cmd_new_upstream () {
  "[git-debrebase anchor: new upstream $new_upstream_version, merge]",
             ];
 
-	my $clogsignoff = cmdoutput qw(git show),
-	    '--pretty=format:%an <%ae>  %aD',
-	    $new_bw;
-
 	# Now we have to add a changelog stanza so the Debian version
-	# is right.
-	die if unlink "debian";
-	die $! unless $!==ENOENT or $!==ENOTEMPTY;
-	unlink "debian/changelog" or $!==ENOENT or die $!;
-        mkdir "debian" or die $!;
-	open CN, ">", "debian/changelog" or die $!;
-	my $oldclog = git_cat_file ":debian/changelog";
-	$oldclog =~ m/^($package_re) \(\S+\) / or
-	    fail "cannot parse old changelog to get package name";
-	my $p = $1;
-	print CN <<END, $oldclog or die $!;
-$p ($new_version) UNRELEASED; urgency=medium
-
-  * Update to new upstream version $new_upstream_version.
-
- -- $clogsignoff
-
-END
-	close CN or die $!;
+	# is right.  We use debchange to do this.  Invoking debchange
+	# here is a bit fiddly because it has a lot of optional
+	# exciting behaviours, some of which will break stuff, and
+	# some of which won't work in a playtree.
+
+	# Make debchange use git's idea of the user's identity.
+	# That way, if the user never uses debchange et al, configuring
+	# git is enough.
+	my $usetup = sub {
+	    my ($e, $k) = @_;
+	    my $v = cfg $k, 1;
+	    defined $v or return;
+	    $ENV{$e} = $v;
+	};
+	$usetup->('DEBEMAIL',    'user.email');
+	$usetup->('DEBFULLNAME', 'user.name');
+
+sleep 2;
+
+	my @dch = (qw(debchange
+		      --allow-lower-version .*
+		      --no-auto-nmu
+		      --preserve
+		      --vendor=Unknown-Vendor
+		      --changelog debian/changelog
+		      --check-dirname-level 0
+		      --release-heuristic=changelog
+		      -v), $new_version,
+		   "Update to new upstream version $new_upstream_version.");
+
+	runcmd @git, qw(checkout -q debian/changelog);
+	runcmd @dch;
 	runcmd @git, qw(update-index --add --replace), 'debian/changelog';
 
 	# Now we have the final new breakwater branch in the index
@@ -2221,7 +2233,7 @@ sub cmd_record_ffq_prev () {
     badusage "no arguments allowed" if @ARGV;
     my ($status, $msg) = record_ffq_prev_deferred();
     if ($status eq 'exists' && $opt_noop_ok) {
-	print "Previous head already recorded\n" or die $!;
+	print "Previous head already recorded\n" or confess $!;
     } elsif ($status eq 'deferred') {
 	run_deferred_updates 'record-ffq-prev';
     } else {
@@ -2232,13 +2244,13 @@ sub cmd_record_ffq_prev () {
 sub cmd_anchor () {
     badusage "no arguments allowed" if @ARGV;
     my ($anchor, $bw) = keycommits +(git_rev_parse 'HEAD'), 0,0;
-    print "$bw\n" or die $!;
+    print "$bw\n" or confess $!;
 }
 
 sub cmd_breakwater () {
     badusage "no arguments allowed" if @ARGV;
     my ($anchor, $bw) = keycommits +(git_rev_parse 'HEAD'), 0,0;
-    print "$bw\n" or die $!;
+    print "$bw\n" or confess $!;
 }
 
 sub cmd_status () {
@@ -2271,7 +2283,7 @@ sub cmd_status () {
 
     my $prcommitinfo = sub {
 	my ($cid) = @_;
-	flush STDOUT or die $!;
+	flush STDOUT or confess $!;
 	runcmd @git, qw(--no-pager log -n1),
 	    '--pretty=format:    %h %s%n',
 	    $cid;
@@ -2627,7 +2639,7 @@ END
     };
 
     complete_convert_from $old_head, $work, $gdrlastinfo, 'convert-from-gbp';
-    print <<END or die $!;
+    print <<END or confess $!;
 git-debrebase: converted from patched-unapplied (gbp) branch format, OK
 END
 }
@@ -2656,7 +2668,7 @@ sub cmd_convert_to_gbp () {
     }
     snags_maybe_bail();
     update_head_checkout $head, $out, "convert to gbp (v0)";
-    print <<END or die $!;
+    print <<END or confess $!;
 git-debrebase: converted to git-buildpackage branch format
 git-debrebase: WARNING: do not now run "git-debrebase" any more
 git-debrebase: WARNING: doing so would drop all upstream patches!
@@ -2746,7 +2758,7 @@ END
 		    $something=1;
 		    last;
 		}
-		die "read $bpd: $!" if $!;
+		confess "read $bpd: $!" if $!;
 		closedir BPD;
 	    }
 	    if ($something) {
@@ -2952,6 +2964,9 @@ sub cmd_downstream_rebase_launder_v0 () {
     }
 }
 
+setlocale(LC_MESSAGES, "");
+textdomain("git-debrebase");
+
 getoptions_main
           ("bad options\n",
 	   "D+" => \$debuglevel,
@@ -2963,9 +2978,9 @@ getoptions_main
 	   'experimental-merge-resolution!', \$opt_merges,
 	   '-i:s' => sub {
 	       my ($opt,$val) = @_;
-	       badusage "git-debrebase: no cuddling to -i for git-rebase"
+	       badusage __ "git-debrebase: no cuddling to -i for git-rebase"
 		   if length $val;
-	       die if $opt_defaultcmd_interactive; # should not happen
+	       confess if $opt_defaultcmd_interactive; # should not happen
 	       $opt_defaultcmd_interactive = [ qw(-i) ];
 	       # This access to @ARGV is excessive familiarity with
 	       # Getopt::Long, but there isn't another sensible
@@ -2994,7 +3009,7 @@ if (!@ARGV || $opt_defaultcmd_interactive || $ARGV[0] =~ m{^-}) {
     $cmdfn =~ y/-/_/;
     $cmdfn = ${*::}{"cmd_$cmdfn"};
 
-    $cmdfn or badusage "unknown git-debrebase sub-operation $cmd";
+    $cmdfn or badusage f_ "unknown git-debrebase sub-operation %s", $cmd;
     $cmdfn->();
 }