threads / patch / 37558

patchgit-svn: delay term initialization

Subject: [PATCH] git-svn: delay term initialization

## tl;dr

3 messages between Sep 14, 2014 and Sep 15, 2014. Diffs are folded; open one to read it.

replies: 2people: 2as markdown or json

Eric Wong· Sep 14, 2014, 08:04 UTC · lore

On my Debian 7 system, this gives annoying warnings when the output of "git svn" commands are redirected:

    Unable to get Terminal Size. The TIOCGWINSZ ioctl didn't work.
    The COLUMNS and LINES environment variables didn't work. The
    resize program didn't work.
Signed-off-by: Eric Wong <normalperson@yhbt.net>
---
 Also, manually tested to ensure dcommit --interactive works.
 git-svn.perl | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)
Show changes to git-svn.perl +11 −7
diff --git a/git-svn.perl b/git-svn.perl
index 40565cd..ce0d7e1 100755
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -306,13 +306,16 @@ sub readline {
 }
 package main;
 
-my $term = eval {
-	$ENV{"GIT_SVN_NOTTY"}
-		? new Term::ReadLine 'git-svn', \*STDIN, \*STDOUT
-		: new Term::ReadLine 'git-svn';
-};
-if ($@) {
-	$term = new FakeTerm "$@: going non-interactive";
+my $term;
+sub term_init {
+	$term = eval {
+		$ENV{"GIT_SVN_NOTTY"}
+			? new Term::ReadLine 'git-svn', \*STDIN, \*STDOUT
+			: new Term::ReadLine 'git-svn';
+	};
+	if ($@) {
+		$term = new FakeTerm "$@: going non-interactive";
+	}
 }
 
 my $cmd;
@@ -424,6 +427,7 @@ sub ask {
 	my $default = $arg{default};
 	my $resp;
 	my $i = 0;
+	term_init() unless $term;
 
 	if ( !( defined($term->IN)
             && defined( fileno($term->IN) )
-- 
EW
Junio C Hamano· Sep 15, 2014, 18:00 UTC · re: Eric Wong · lore

Re: [PATCH] git-svn: delay term initialization

Eric Wong <normalperson@yhbt.net> writes:
Show 10 quoted lines
> On my Debian 7 system, this gives annoying warnings when the output
> of "git svn" commands are redirected:
>
>     Unable to get Terminal Size. The TIOCGWINSZ ioctl didn't work.
>     The COLUMNS and LINES environment variables didn't work. The
>     resize program didn't work.
>
> Signed-off-by: Eric Wong <normalperson@yhbt.net>
> ---
>  Also, manually tested to ensure dcommit --interactive works.
Makes sense.
Show 40 quoted lines
>
>  git-svn.perl | 18 +++++++++++-------
>  1 file changed, 11 insertions(+), 7 deletions(-)
>
> diff --git a/git-svn.perl b/git-svn.perl
> index 40565cd..ce0d7e1 100755
> --- a/git-svn.perl
> +++ b/git-svn.perl
> @@ -306,13 +306,16 @@ sub readline {
>  }
>  package main;
>  
> -my $term = eval {
> -	$ENV{"GIT_SVN_NOTTY"}
> -		? new Term::ReadLine 'git-svn', \*STDIN, \*STDOUT
> -		: new Term::ReadLine 'git-svn';
> -};
> -if ($@) {
> -	$term = new FakeTerm "$@: going non-interactive";
> +my $term;
> +sub term_init {
> +	$term = eval {
> +		$ENV{"GIT_SVN_NOTTY"}
> +			? new Term::ReadLine 'git-svn', \*STDIN, \*STDOUT
> +			: new Term::ReadLine 'git-svn';
> +	};
> +	if ($@) {
> +		$term = new FakeTerm "$@: going non-interactive";
> +	}
>  }
>  
>  my $cmd;
> @@ -424,6 +427,7 @@ sub ask {
>  	my $default = $arg{default};
>  	my $resp;
>  	my $i = 0;
> +	term_init() unless $term;
>  
>  	if ( !( defined($term->IN)
>              && defined( fileno($term->IN) )

← back to recent threads