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

diff --git a/git-debrebase b/git-debrebase
index 4756748a..645b072a 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;
@@ -2064,7 +2066,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 +2172,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
@@ -2952,6 +2963,9 @@ sub cmd_downstream_rebase_launder_v0 () {
     }
 }
 
+setlocale(LC_MESSAGES, "");
+textdomain("git-debrebase");
+
 getoptions_main
           ("bad options\n",
 	   "D+" => \$debuglevel,
@@ -2963,7 +2977,7 @@ 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
 	       $opt_defaultcmd_interactive = [ qw(-i) ];
@@ -2994,7 +3008,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->();
 }