git-debrebase: Replace several `git-debrebase:' with `$us:'

[dgit.git] / git-debrebase

diff --git a/git-debrebase b/git-debrebase
index 39f79cd5f92cd7aa637e1e2313931e9306922fe0..2fa8cf479cf147be232acbbc91764b0384d0f575 100755 (executable)
--- a/git-debrebase
+++ b/git-debrebase
@@ -397,10 +397,10 @@ sub snag ($$;@) {
     my ($tag,$msg) = @_; # ignores extra args, for benefit of keycommits
     if (grep { $_ eq $tag } @snag_force_opts) {
        $snags_forced++;
-       print STDERR "git-debrebase: snag ignored (-f$tag): $msg\n";
+       print STDERR "$us: snag ignored (-f$tag): $msg\n";
     } else {
        $snags_tripped++;
-       print STDERR "git-debrebase: snag detected (-f$tag): $msg\n";
+       print STDERR "$us: snag detected (-f$tag): $msg\n";
     }
 }
 
@@ -1742,7 +1742,7 @@ sub update_head_checkout ($$$) {
 sub update_head_postlaunder ($$$) {
     my ($old, $tip, $reflogmsg) = @_;
     return if $tip eq $old && !@deferred_updates;
-    print "git-debrebase: laundered (head was $old)\n";
+    print "$us: laundered (head was $old)\n";
     update_head $old, $tip, $reflogmsg;
     # no tree changes except debian/patches
     runcmd @git, qw(rm --quiet --ignore-unmatch -rf debian/patches);
@@ -2516,7 +2516,7 @@ sub cmd_convert_from_gbp () {
 
     my $clogp = parsechangelog();
     my $version = $clogp->{'Version'}
-       // die "missing Version from changelog";
+       // die "missing Version from changelog\n";
 
     my ($upstream_spec) = @ARGV;
 
@@ -2640,7 +2640,7 @@ END
 
     complete_convert_from $old_head, $work, $gdrlastinfo, 'convert-from-gbp';
     print <<END or confess $!;
-git-debrebase: converted from patched-unapplied (gbp) branch format, OK
+$us: converted from patched-unapplied (gbp) branch format, OK
 END
 }
 
@@ -2669,9 +2669,9 @@ sub cmd_convert_to_gbp () {
     snags_maybe_bail();
     update_head_checkout $head, $out, "convert to gbp (v0)";
     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!
+$us: converted to git-buildpackage branch format
+$us: WARNING: do not now run "git-debrebase" any more
+$us: WARNING: doing so would drop all upstream patches!
 END
 }
 
@@ -2748,7 +2748,7 @@ END
            # we do a quick check to see if there are plausible origs
            my $something=0;
            if (!opendir BPD, $bpd) {
-               die "$bpd: opendir: $!" unless $!==ENOENT;
+               die "opendir build-products-dir $bpd: $!" unless $!==ENOENT;
            } else {
                while ($!=0, my $f = readdir BPD) {
                    next unless is_orig_file_of_p_v $f, $p, $version;
@@ -2995,7 +2995,7 @@ initdebug('git-debrebase ');
 enabledebug if $debuglevel;
 
 my $toplevel = cmdoutput @git, qw(rev-parse --show-toplevel);
-chdir $toplevel or die "chdir $toplevel: $!";
+chdir $toplevel or fail "chdir toplevel $toplevel: $!\n";
 
 $rd = fresh_playground "$playprefix/misc";