X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=dgit;h=b1ed90447748bb25d95f75f9575badc26e00aa08;hp=b6d815870165667d72513da46194b0dea42c2dfc;hb=41e0ec2b26cba9b3d4016b195ec8795ca1bd40f4;hpb=863475c001c7846fe4de4310f517207bd8178871

diff --git a/dgit b/dgit
index b6d81587..b1ed9044 100755
--- a/dgit
+++ b/dgit
@@ -38,7 +38,7 @@ our $package;
 our @ropts;
 
 our $sign = 1;
-our $dryrun = 0;
+our $dryrun_level = 0;
 our $changesfile;
 our $new_package = 0;
 our $ignoredirty = 0;
@@ -83,6 +83,8 @@ our $keyid;
 our $debug = 0;
 open DEBUG, ">/dev/null" or die $!;
 
+autoflush STDOUT 1;
+
 our $remotename = 'dgit';
 our @ourdscfield = qw(Dgit Vcs-Dgit-Master);
 our $branchprefix = 'dgit';
@@ -335,8 +337,11 @@ sub runcmd {
     failedcmd @_ if system @_;
 }
 
+sub act_local () { return $dryrun_level <= 1; }
+sub act_scary () { return !$dryrun_level; }
+
 sub printdone {
-    if (!$dryrun) {
+    if (!$dryrun_level) {
 	progress "dgit ok: @_";
     } else {
 	progress "would be ok: @_ (but dry run only)";
@@ -369,7 +374,15 @@ sub dryrun_report {
 }
 
 sub runcmd_ordryrun {
-    if (!$dryrun) {
+    if (act_scary()) {
+	runcmd @_;
+    } else {
+	dryrun_report @_;
+    }
+}
+
+sub runcmd_ordryrun_local {
+    if (act_local()) {
 	runcmd @_;
     } else {
 	dryrun_report @_;
@@ -391,6 +404,7 @@ main usages:
 important dgit options:
   -k<keyid>           sign tag and package with <keyid> instead of default
   --dry-run -n        do not change anything, but go through the motions
+  --damp-run -L       like --dry-run but make local changes, without signing
   --new -N            allow introducing a new package
   --debug -D          increase debug level
   -c<name>=<value>    set git config option (used directly by dgit too)
@@ -865,7 +879,7 @@ sub ensure_we_have_orig () {
 	$origurl .= "/$f";
 	die "$f ?" unless $f =~ m/^${package}_/;
 	die "$f ?" if $f =~ m#/#;
-	runcmd_ordryrun shell_cmd 'cd ..', @dget,'--',$origurl;
+	runcmd_ordryrun_local shell_cmd 'cd ..', @dget,'--',$origurl;
     }
 }
 
@@ -886,7 +900,7 @@ sub is_fast_fwd ($$) {
 }
 
 sub git_fetch_us () {
-    runcmd_ordryrun @git, qw(fetch),access_giturl(),fetchspec();
+    runcmd_ordryrun_local @git, qw(fetch),access_giturl(),fetchspec();
 }
 
 sub fetch_from_archive () {
@@ -993,7 +1007,7 @@ END
     }
     if ($lastpush_hash ne $hash) {
 	my @upd_cmd = (@git, qw(update-ref -m), 'dgit fetch', lrref(), $hash);
-	if (!$dryrun) {
+	if (act_local()) {
 	    cmdoutput @upd_cmd;
 	} else {
 	    dryrun_report @upd_cmd;
@@ -1005,7 +1019,7 @@ END
 sub clone ($) {
     my ($dstdir) = @_;
     canonicalise_suite();
-    badusage "dry run makes no sense with clone" if $dryrun;
+    badusage "dry run makes no sense with clone" unless act_local();
     mkdir $dstdir or die "$dstdir $!";
     chdir "$dstdir" or die "$dstdir $!";
     runcmd @git, qw(init -q);
@@ -1017,7 +1031,7 @@ sub clone ($) {
     if (check_for_git()) {
 	progress "fetching existing git history";
 	git_fetch_us();
-	runcmd_ordryrun @git, qw(fetch origin);
+	runcmd_ordryrun_local @git, qw(fetch origin);
     } else {
 	progress "starting new git history";
     }
@@ -1036,7 +1050,7 @@ sub fetch () {
 
 sub pull () {
     fetch();
-    runcmd_ordryrun @git, qw(merge -m),"Merge from $csuite [dgit]",
+    runcmd_ordryrun_local @git, qw(merge -m),"Merge from $csuite [dgit]",
         lrref();
     printdone "fetched to ".lrref()." and merged into HEAD";
 }
@@ -1057,25 +1071,20 @@ sub check_not_dirty () {
 sub commit_quilty_patch () {
     my $output = cmdoutput @git, qw(status --porcelain);
     my %adds;
-    my $bad=0;
     foreach my $l (split /\n/, $output) {
 	next unless $l =~ m/\S/;
 	if ($l =~ m{^(?:\?\?| M) (.pc|debian/patches)}) {
 	    $adds{$1}++;
-	} else {
-	    print STDERR "git status: $l\n";
-	    $bad++;
 	}
     }
-    fail "unexpected output from git status (is tree clean?)" if $bad;
     if (!%adds) {
 	progress "nothing quilty to commit, ok.";
 	return;
     }
-    runcmd_ordryrun @git, qw(add), sort keys %adds;
+    runcmd_ordryrun_local @git, qw(add), sort keys %adds;
     my $m = "Commit Debian 3.0 (quilt) metadata";
     progress "$m";
-    runcmd_ordryrun @git, qw(commit -m), $m;
+    runcmd_ordryrun_local @git, qw(commit -m), $m;
 }
 
 sub madformat ($) {
@@ -1157,7 +1166,7 @@ END
 	push @sign_cmd, qw(-u),$keyid if defined $keyid;
 	push @sign_cmd, $tfn->('.tmp');
 	runcmd_ordryrun @sign_cmd;
-	if (!$dryrun) {
+	if (act_scary()) {
 	    $tagobjfn = $tfn->('.signed.tmp');
 	    runcmd shell_cmd "exec >$tagobjfn", qw(cat --),
 	        $tfn->('.tmp'), $tfn->('.tmp.asc');
@@ -1256,7 +1265,7 @@ sub dopush () {
 
     my $tag_obj_hash = cmdoutput @git, qw(hash-object -w -t tag), $tagobjfn;
     runcmd_ordryrun @git, qw(verify-tag), $tag_obj_hash;
-    runcmd_ordryrun @git, qw(update-ref), "refs/tags/$tag", $tag_obj_hash;
+    runcmd_ordryrun_local @git, qw(update-ref), "refs/tags/$tag", $tag_obj_hash;
     runcmd_ordryrun @git, qw(tag -v --), $tag;
 
     if (!check_for_git()) {
@@ -1266,7 +1275,7 @@ sub dopush () {
     runcmd_ordryrun @git, qw(update-ref -m), 'dgit push', lrref(), 'HEAD';
 
     if (!$we_are_responder) {
-	if (!$dryrun) {
+	if (act_local()) {
 	    rename "../$dscfn.tmp","../$dscfn" or die "$dscfn $!";
 	} else {
 	    progress "[new .dsc left in $dscfn.tmp]";
@@ -1274,7 +1283,7 @@ sub dopush () {
     }
 
     if ($we_are_responder) {
-	my $dryrunsuffix = $dryrun ? ".tmp" : "";
+	my $dryrunsuffix = act_local() ? "" : ".tmp";
 	responder_receive_files('signed-dsc-changes',
 				"../$dscfn$dryrunsuffix",
 				"$changesfile$dryrunsuffix");
@@ -1404,7 +1413,7 @@ sub cmd_remote_push_responder {
     chdir $dir or die "$dir: $!";
     $we_are_responder = 1;
     $debugprefix = ' ';
-    $|=1;
+    autoflush STDOUT 1;
     responder_send_command("dgit-remote-push-ready");
     &cmd_push;
 }
@@ -1577,7 +1586,7 @@ END
 	local $ENV{'EDITOR'} = cmdoutput qw(realpath --), $0;
 	local $ENV{'VISUAL'} = $ENV{'EDITOR'};
 	local $ENV{$fakeeditorenv} = cmdoutput qw(realpath --), $descfn;
-	runcmd_ordryrun @dpkgsource, qw(--commit .), $patchname;
+	runcmd_ordryrun_local @dpkgsource, qw(--commit .), $patchname;
     }
 
     if (!open P, '>>', ".pc/applied-patches") {
@@ -1622,7 +1631,7 @@ sub cmd_build {
     badusage "dgit build implies --clean=dpkg-source"
 	if $cleanmode ne 'dpkg-source';
     build_prep();
-    runcmd_ordryrun @dpkgbuildpackage, qw(-us -uc), changesopts(), @ARGV;
+    runcmd_ordryrun_local @dpkgbuildpackage, qw(-us -uc), changesopts(), @ARGV;
     printdone "build successful\n";
 }
 
@@ -1638,7 +1647,7 @@ sub cmd_git_build {
 	push @cmd, "--git-debian-branch=".lbranch();
     }
     push @cmd, changesopts();
-    runcmd_ordryrun @cmd, @ARGV;
+    runcmd_ordryrun_local @cmd, @ARGV;
     printdone "build successful\n";
 }
 
@@ -1647,10 +1656,11 @@ sub build_source {
     $sourcechanges = "${package}_".(stripepoch $version)."_source.changes";
     $dscfn = dscfn($version);
     if ($cleanmode eq 'dpkg-source') {
-	runcmd_ordryrun (@dpkgbuildpackage, qw(-us -uc -S)), changesopts();
+	runcmd_ordryrun_local (@dpkgbuildpackage, qw(-us -uc -S)),
+	    changesopts();
     } else {
 	if ($cleanmode eq 'git') {
-	    runcmd_ordryrun @git, qw(clean -xdf);
+	    runcmd_ordryrun_local @git, qw(clean -xdf);
 	} elsif ($cleanmode eq 'none') {
 	} else {
 	    die "$cleanmode ?";
@@ -1658,9 +1668,9 @@ sub build_source {
 	my $pwd = cmdoutput qw(env - pwd);
 	my $leafdir = basename $pwd;
 	chdir ".." or die $!;
-	runcmd_ordryrun @dpkgsource, qw(-b --), $leafdir;
+	runcmd_ordryrun_local @dpkgsource, qw(-b --), $leafdir;
 	chdir $pwd or die $!;
-	runcmd_ordryrun qw(sh -ec),
+	runcmd_ordryrun_local qw(sh -ec),
 	    'exec >$1; shift; exec "$@"','x',
 	    "../$sourcechanges",
 	    @dpkggenchanges, qw(-S), changesopts();
@@ -1677,7 +1687,7 @@ sub cmd_sbuild {
     build_source();
     chdir ".." or die $!;
     my $pat = "${package}_".(stripepoch $version)."_*.changes";
-    if (!$dryrun) {
+    if (act_local()) {
 	stat $dscfn or fail "$dscfn (in parent directory): $!";
 	stat $sourcechanges or fail "$sourcechanges (in parent directory): $!";
 	foreach my $cf (glob $pat) {
@@ -1685,10 +1695,10 @@ sub cmd_sbuild {
 	    unlink $cf or fail "remove $cf: $!";
 	}
     }
-    runcmd_ordryrun @sbuild, @ARGV, qw(-d), $isuite, $dscfn;
-    runcmd_ordryrun @mergechanges, glob $pat;
+    runcmd_ordryrun_local @sbuild, @ARGV, qw(-d), $isuite, $dscfn;
+    runcmd_ordryrun_local @mergechanges, glob $pat;
     my $multichanges = "${package}_".(stripepoch $version)."_multi.changes";
-    if (!$dryrun) {
+    if (act_local()) {
 	stat $multichanges or fail "$multichanges: $!";
     }
     printdone "build successful, results in $multichanges\n" or die $!;
@@ -1724,7 +1734,10 @@ sub parseopts () {
 	if (m/^--/) {
 	    if (m/^--dry-run$/) {
 		push @ropts, $_;
-		$dryrun=1;
+		$dryrun_level=2;
+	    } elsif (m/^--damp-run$/) {
+		push @ropts, $_;
+		$dryrun_level=1;
 	    } elsif (m/^--no-sign$/) {
 		push @ropts, $_;
 		$sign=0;
@@ -1768,13 +1781,17 @@ sub parseopts () {
 	} else {
 	    while (m/^-./s) {
 		if (s/^-n/-/) {
-		    push @ropts, $_;
-		    $dryrun=1;
+		    push @ropts, $&;
+		    $dryrun_level=2;
+		} elsif (s/^-L/-/) {
+		    push @ropts, $&;
+		    $dryrun_level=1;
 		} elsif (s/^-h/-/) {
 		    cmd_help();
 		} elsif (s/^-D/-/) {
 		    push @ropts, $&;
 		    open DEBUG, ">&STDERR" or die $!;
+		    autoflush DEBUG 1;
 		    $debug++;
 		} elsif (s/^-N/-/) {
 		    push @ropts, $&;
@@ -1818,7 +1835,9 @@ if ($ENV{$fakeeditorenv}) {
 delete $ENV{'DGET_UNPACK'};
 
 parseopts();
-print STDERR "DRY RUN ONLY\n" if $dryrun;
+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 die $!;
     exit 8;