X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=dgit;h=8cea07b7af8a16d65016f3c7f68d1625f5768471;hb=0d948b7ca6205272838569aeeb3b5bb83f1b8f09;hp=32b024eca090ee82f0271d5b94ac4819618409d5;hpb=18c41ad7f852905ddf59eede58d0697390d0b36a;p=dgit.git

diff --git a/dgit b/dgit
index 32b024ec..8cea07b7 100755
--- a/dgit
+++ b/dgit
@@ -379,6 +379,10 @@ sub branch_is_gdr ($) {
 	    printdebug "branch_is_gdr  $walk ?-octopus NO\n";
 	    return 0;
 	}
+	if (!@parents) {
+	    printdebug "branch_is_gdr  $walk origin\n";
+	    return 0;
+	}
 	if ($get_patches->($walk) ne $tip_patches) {
 	    # Our parent added, removed, or edited patches, and wasn't
 	    # a gdr make-patches commit.  gdr make-patches probably
@@ -4012,7 +4016,7 @@ END
 sub pseudomerge_make_commit ($$$$ $$) {
     my ($clogp, $dgitview, $archive_hash, $i_arch_v,
 	$msg_cmd, $msg_msg) = @_;
-    progress f_ "Declaring that HEAD inciudes all changes in %s...",
+    progress f_ "Declaring that HEAD includes all changes in %s...",
 	         $i_arch_v->[0];
 
     my $tree = cmdoutput qw(git rev-parse), "${dgitview}:";
@@ -4068,7 +4072,7 @@ sub splitbrain_pseudomerge ($$$$) {
     my $i_arch_v = pseudomerge_version_check($clogp, $archive_hash);
 
     if (!defined $overwrite_version) {
-	progress __ "Checking that HEAD inciudes all changes in archive...";
+	progress __ "Checking that HEAD includes all changes in archive...";
     }
 
     return $dgitview if is_fast_fwd $archive_hash, $dgitview;
@@ -4519,11 +4523,11 @@ ENDT
     if ($sourceonlypolicy eq 'ok') {
     } elsif ($sourceonlypolicy eq 'always') {
 	forceable_fail [qw(uploading-binaries)],
-	    __ "uploading binaries, although distroy policy is source only"
+	    __ "uploading binaries, although distro policy is source only"
 	    if $hasdebs;
     } elsif ($sourceonlypolicy eq 'never') {
 	forceable_fail [qw(uploading-source-only)],
-	    __ "source-only upload, although distroy policy requires .debs"
+	    __ "source-only upload, although distro policy requires .debs"
 	    if !$hasdebs;
     } elsif ($sourceonlypolicy eq 'not-wholly-new') {
 	forceable_fail [qw(uploading-source-only)],
@@ -5499,7 +5503,8 @@ sub quiltify ($$$$) {
 	    printdebug "considering C=$c->{Commit} P=$p->{Commit}\n";
 
 	    my @cmd= (@git, qw(diff-tree -r --name-only),
-		      $p->{Commit},$c->{Commit}, qw(-- debian/patches .pc));
+		      $p->{Commit},$c->{Commit},
+		      qw(-- debian/patches .pc debian/source/format));
 	    my $patchstackchange = cmdoutput @cmd;
 	    if (length $patchstackchange) {
 		$patchstackchange =~ s/\n/,/g;
@@ -5715,7 +5720,10 @@ END
 	if (act_local()) {
 	    debugcmd "+",@cmd;
 	    $!=0; $?=-1;
-	    failedcmd @cmd if system @cmd and $?!=7*256;
+	    failedcmd @cmd
+		if system @cmd
+		and not ($? == 7*256 or
+			 $? == -1 && $!==ENOENT);
 	} else {
 	    dryrun_report @cmd;
 	}
@@ -6805,7 +6813,7 @@ sub cmd_import_dsc {
 	    fail f_ <<END, $dsc_hash
 .dsc contains Dgit field referring to object %s
 Your git tree does not have that object.  Try `git fetch' from a
-plausible server (browse.dgit.d.o? alioth?), and try the import-dsc again.
+plausible server (browse.dgit.d.o? salsa?), and try the import-dsc again.
 END
 	}
 	if ($oldhash && !is_fast_fwd $oldhash, $dsc_hash) {
@@ -6848,13 +6856,15 @@ END
 		$dscfn;
 	}
 	$there =~ s#/+[^/]+$## or fail f_
-	    "import %s requires ../%s, but it does not exist",
+	    "import %s requires .../%s, but it does not exist",
 	    $dscfn, $f;
 	$there .= "/$f";
 	my $test = $there =~ m{^/} ? $there : "../$there";
-	stat $test or fail "import $dscfn requires $test, but: $!";
-	symlink $there, $here or fail "symlink $there to $here: $!";
-	progress "made symlink $here -> $there";
+	stat $test or fail f_
+	    "import %s requires %s, but: %s", $dscfn, $test, $!;
+	symlink $there, $here or fail f_
+	    "symlink %s to %s: %s", $there, $here, $!;
+	progress f_ "made symlink %s -> %s", $here, $there;
 #	print STDERR Dumper($fi);
     }
     my @mergeinputs = generate_commits_from_dsc();
@@ -6864,21 +6874,24 @@ END
 
     if ($oldhash) {
 	if ($force > 0) {
-	    progress "Import, forced update - synthetic orphan git history.";
+	    progress __
+		"Import, forced update - synthetic orphan git history.";
 	} elsif ($force < 0) {
-	    progress "Import, merging.";
+	    progress __ "Import, merging.";
 	    my $tree = cmdoutput @git, qw(rev-parse), "$newhash:";
 	    my $version = getfield $dsc, 'Version';
 	    my $clogp = commit_getclogp $newhash;
 	    my $authline = clogp_authline $clogp;
-	    $newhash = make_commit_text <<END;
+	    $newhash = make_commit_text <<ENDU
 tree $tree
 parent $newhash
 parent $oldhash
 author $authline
 committer $authline
 
-Merge $package ($version) import into $dstbranch
+ENDU
+		.(f_ <<END, $package, $version, $dstbranch);
+Merge %s (%s) import into %s
 END
 	} else {
 	    die; # caught earlier
@@ -6887,20 +6900,20 @@ END
 
     import_dsc_result $dstbranch, $newhash,
 	"dgit import-dsc: $info",
-	"results are in in git ref $dstbranch";
+	f_ "results are in git ref %s", $dstbranch;
 }
 
 sub pre_archive_api_query () {
     not_necessarily_a_tree();
 }
 sub cmd_archive_api_query {
-    badusage "need only 1 subpath argument" unless @ARGV==1;
+    badusage __ "need only 1 subpath argument" unless @ARGV==1;
     my ($subpath) = @ARGV;
     local $isuite = 'DGIT-API-QUERY-CMD';
     my @cmd = archive_api_query_cmd($subpath);
     push @cmd, qw(-f);
     debugcmd ">",@cmd;
-    exec @cmd or fail "exec curl: $!\n";
+    exec @cmd or fail f_ "exec curl: %s\n", $!;
 }
 
 sub repos_server_url () {
@@ -6914,19 +6927,20 @@ sub pre_clone_dgit_repos_server () {
     not_necessarily_a_tree();
 }
 sub cmd_clone_dgit_repos_server {
-    badusage "need destination argument" unless @ARGV==1;
+    badusage __ "need destination argument" unless @ARGV==1;
     my ($destdir) = @ARGV;
     my $url = repos_server_url();
     my @cmd = (@git, qw(clone), $url, $destdir);
     debugcmd ">",@cmd;
-    exec @cmd or fail "exec git clone: $!\n";
+    exec @cmd or fail f_ "exec git clone: %s\n", $!;
 }
 
 sub pre_print_dgit_repos_server_source_url () {
     not_necessarily_a_tree();
 }
 sub cmd_print_dgit_repos_server_source_url {
-    badusage "no arguments allowed to dgit print-dgit-repos-server-source-url"
+    badusage __
+	"no arguments allowed to dgit print-dgit-repos-server-source-url"
 	if @ARGV;
     my $url = repos_server_url();
     print $url, "\n" or confess $!;
@@ -6936,31 +6950,33 @@ sub pre_print_dpkg_source_ignores {
     not_necessarily_a_tree();
 }
 sub cmd_print_dpkg_source_ignores {
-    badusage "no arguments allowed to dgit print-dpkg-source-ignores"
+    badusage __
+	"no arguments allowed to dgit print-dpkg-source-ignores"
 	if @ARGV;
     print "@dpkg_source_ignores\n" or confess $!;
 }
 
 sub cmd_setup_mergechangelogs {
-    badusage "no arguments allowed to dgit setup-mergechangelogs" if @ARGV;
+    badusage __ "no arguments allowed to dgit setup-mergechangelogs"
+	if @ARGV;
     local $isuite = 'DGIT-SETUP-TREE';
     setup_mergechangelogs(1);
 }
 
 sub cmd_setup_useremail {
-    badusage "no arguments allowed to dgit setup-useremail" if @ARGV;
+    badusage __ "no arguments allowed to dgit setup-useremail" if @ARGV;
     local $isuite = 'DGIT-SETUP-TREE';
     setup_useremail(1);
 }
 
 sub cmd_setup_gitattributes {
-    badusage "no arguments allowed to dgit setup-useremail" if @ARGV;
+    badusage __ "no arguments allowed to dgit setup-useremail" if @ARGV;
     local $isuite = 'DGIT-SETUP-TREE';
     setup_gitattrs(1);
 }
 
 sub cmd_setup_new_tree {
-    badusage "no arguments allowed to dgit setup-tree" if @ARGV;
+    badusage __ "no arguments allowed to dgit setup-tree" if @ARGV;
     local $isuite = 'DGIT-SETUP-TREE';
     setup_new_tree();
 }
@@ -7007,8 +7023,8 @@ defvalopt '', '-C', '.+', sub {
 defvalopt '--initiator-tempdir','','.*', sub {
     ($initiator_tempdir) = (@_);
     $initiator_tempdir =~ m#^/# or
-	badusage "--initiator-tempdir must be used specify an".
-	" absolute, not relative, directory."
+	badusage __ "--initiator-tempdir must be used specify an".
+	            " absolute, not relative, directory."
 };
 
 sub defoptmodes ($@) {
@@ -7046,11 +7062,11 @@ sub parseopts () {
 	my ($what) = @_;
 	@rvalopts = ($_);
 	if (!defined $val) {
-	    badusage "$what needs a value" unless @ARGV;
+	    badusage f_ "%s needs a value", $what unless @ARGV;
 	    $val = shift @ARGV;
 	    push @rvalopts, $val;
 	}
-	badusage "bad value \`$val' for $what" unless
+	badusage f_ "bad value \`%s' for %s", $val, $what unless
 	    $val =~ m/^$oi->{Re}$(?!\n)/s;
 	my $how = $oi->{How};
 	if (ref($how) eq 'SCALAR') {
@@ -7135,7 +7151,8 @@ sub parseopts () {
 		$_='';
 	    } elsif (m/^--force-/) {
 		print STDERR
-		    "$us: warning: ignoring unknown force option $_\n";
+		    f_ "%s: warning: ignoring unknown force option %s\n",
+		       $us, $_;
 		$_='';
 	    } elsif (m/^--dgit-tag-format=(old|new)$/s) {
 		# undocumented, for testing
@@ -7154,7 +7171,7 @@ sub parseopts () {
 		push @ropts, $_;
 		$funcopts_long{$_}();
 	    } else {
-		badusage "unknown long option \`$_'";
+		badusage f_ "unknown long option \`%s'", $_;
 	    }
 	} else {
 	    while (m/^-./s) {
@@ -7207,7 +7224,7 @@ sub parseopts () {
 		    $valopt->($oi->{Short});
 		    $_ = '';
 		} else {
-		    badusage "unknown short option \`$_'";
+		    badusage f_ "unknown short option \`%s'", $_;
 		}
 	    }
 	}
@@ -7222,17 +7239,18 @@ sub check_env_sanity () {
 	foreach my $name (qw(PIPE CHLD)) {
 	    my $signame = "SIG$name";
 	    my $signum = eval "POSIX::$signame" // die;
-	    die "$signame is set to something other than SIG_DFL\n"
+	    die f_ "%s is set to something other than SIG_DFL\n",
+		$signame
 		if defined $SIG{$name} and $SIG{$name} ne 'DEFAULT';
 	    $blocked->ismember($signum) and
-		die "$signame is blocked\n";
+		die f_ "%s is blocked\n", $signame;
 	}
     };
     return unless $@;
     chomp $@;
-    fail <<END;
-On entry to dgit, $@
-This is a bug produced by something in in your execution environment.
+    fail f_ <<END, $@;
+On entry to dgit, %s
+This is a bug produced by something in your execution environment.
 Giving up.
 END
 }
@@ -7248,7 +7266,7 @@ sub parseopts_late_defaults () {
 
 	my $v = access_cfg("cmd-$k", 'RETURN-UNDEF');
 	if (defined $v) {
-	    badcfg "cannot set command for $k"
+	    badcfg f_ "cannot set command for %s", $k
 		unless length $om->[0];
 	    $om->[0] = $v;
 	}
@@ -7261,7 +7279,7 @@ sub parseopts_late_defaults () {
 	    printdebug "CL $c ", (join " ", map { shellquote } @vl),
 	        "\n" if $debuglevel >= 4;
 	    next unless @vl;
-	    badcfg "cannot configure options for $k"
+	    badcfg f_ "cannot configure options for %s", $k
 		if $opts_opt_cmdonly{$k};
 	    my $insertpos = $opts_cfg_insertpos{$k};
 	    @$om = ( @$om[0..$insertpos-1],
@@ -7281,7 +7299,7 @@ sub parseopts_late_defaults () {
 	    // access_cfg('quilt-mode', 'RETURN-UNDEF')
 	    // 'linear';
 	$quilt_mode =~ m/^($quilt_modes_re)$/ 
-	    or badcfg "unknown quilt-mode \`$quilt_mode'";
+	    or badcfg f_ "unknown quilt-mode \`%s'", $quilt_mode;
 	$quilt_mode = $1;
     }
 
@@ -7291,7 +7309,8 @@ sub parseopts_late_defaults () {
 	next if defined $$vr;
 	$$vr = access_cfg($moc->{Key}, 'RETURN-UNDEF') // $moc->{Default};
 	my $v = $moc->{Vals}{$$vr};
-	badcfg "unknown $moc->{Key} setting \`$$vr'" unless defined $v;
+	badcfg f_ "unknown %s setting \`%s'", $moc->{Key}, $$vr
+	    unless defined $v;
 	$$vr = $v;
     }
 
@@ -7303,7 +7322,7 @@ sub parseopts_late_defaults () {
 	$cleanmode = access_cfg('clean-mode', 'RETURN-UNDEF');
 	$cleanmode //= 'dpkg-source';
 
-	badcfg "unknown clean-mode \`$cleanmode'" unless
+	badcfg f_ "unknown clean-mode \`%s'", $cleanmode unless
 	    $cleanmode =~ m/^($cleanmode_re)$(?!\n)/s;
     }
 
@@ -7324,8 +7343,8 @@ if ($ENV{$fakeeditorenv}) {
 parseopts();
 check_env_sanity();
 
-print STDERR "DRY RUN ONLY\n" if $dryrun_level > 1;
-print STDERR "DAMP RUN - WILL MAKE LOCAL (UNSIGNED) CHANGES\n"
+print STDERR __ "DRY RUN ONLY\n" if $dryrun_level > 1;
+print STDERR __ "DAMP RUN - WILL MAKE LOCAL (UNSIGNED) CHANGES\n"
     if $dryrun_level == 1;
 if (!@ARGV) {
     print STDERR __ $helpmsg or confess $!;
@@ -7341,7 +7360,7 @@ record_maindir if $invoked_in_git_tree;
 git_slurp_config();
 
 my $fn = ${*::}{"cmd_$cmd"};
-$fn or badusage "unknown operation $cmd";
+$fn or badusage f_ "unknown operation %s", $cmd;
 $fn->();
 
 finish 0;