From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 8 Oct 2016 21:01:12 +0000 (+0100)
Subject: New import: Tidy up output from gbp pq
X-Git-Tag: archive/debian/2.0~77
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=7a0d541064203fb3db4661fc9ed265d5c8308bf5;p=dgit.git

New import: Tidy up output from gbp pq

gbp pq import can print some warnings if it doesn't like the patches
much.  There is no point showing these warnings to the user of `dgit
clone' or `dgit fetch'.

As for the warnings in split brain mode, we will leave those, and
leave them with colour enabled.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/TODO.BRANCH b/TODO.BRANCH
index 0951402c..ec77c734 100644
--- a/TODO.BRANCH
+++ b/TODO.BRANCH
@@ -5,9 +5,6 @@ OTHER
    Honour (and strip) Gbp-Pq Topic and Gbp-Pq Name
 
  * Provide --gpbpq[=:] options
- * When invoking gbp pq internally, use --color=off
- * When invoking gbp pq during import, redirect stderr
-   and print only on failure
 
  * Fix up README.dsc-import to describe actual algorithm as implemented
 
diff --git a/dgit b/dgit
index cdf16700..def2c349 100755
--- a/dgit
+++ b/dgit
@@ -1843,7 +1843,14 @@ END
 	local $ENV{GIT_AUTHOR_EMAIL} = $authline[1];
 	local $ENV{GIT_AUTHOR_DATE} =  $authline[2];
 
-	runcmd shell_cmd 'exec >/dev/null', @gbp, qw(pq import);
+	eval {
+	    runcmd shell_cmd 'exec >/dev/null 2>../../gbp-pq-output',
+		@gbp, qw(pq import);
+	};
+	if ($@) {
+	    { local $@; eval { runcmd qw(cat ../../gbp-pq-output); }; }
+	    die $@;
+	}
 
 	my $gapplied = git_rev_parse('HEAD');
 	my $gappliedtree = cmdoutput @git, qw(rev-parse HEAD:);