-
Notifications
You must be signed in to change notification settings - Fork 164
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* jn/maint-fix-pager: tests: Fix race condition in t7006-pager t7006-pager: if stdout is not a terminal, make a new one tests: Add tests for automatic use of pager am: Fix launching of pager git svn: Fix launching of pager git.1: Clarify the behavior of the --paginate option Make 'git var GIT_PAGER' always print the configured pager Fix 'git var' usage synopsis
- Loading branch information
Showing
10 changed files
with
268 additions
and
15 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,176 @@ | ||
| #!/bin/sh | ||
|
|
||
| test_description='Test automatic use of a pager.' | ||
|
|
||
| . ./test-lib.sh | ||
|
|
||
| rm -f stdout_is_tty | ||
| test_expect_success 'set up terminal for tests' ' | ||
| if test -t 1 | ||
| then | ||
| : > stdout_is_tty | ||
| elif | ||
| test_have_prereq PERL && | ||
| "$PERL_PATH" "$TEST_DIRECTORY"/t7006/test-terminal.perl \ | ||
| sh -c "test -t 1" | ||
| then | ||
| : > test_terminal_works | ||
| fi | ||
| ' | ||
|
|
||
| if test -e stdout_is_tty | ||
| then | ||
| test_terminal() { "$@"; } | ||
| test_set_prereq TTY | ||
| elif test -e test_terminal_works | ||
| then | ||
| test_terminal() { | ||
| "$PERL_PATH" "$TEST_DIRECTORY"/t7006/test-terminal.perl "$@" | ||
| } | ||
| test_set_prereq TTY | ||
| else | ||
| say no usable terminal, so skipping some tests | ||
| fi | ||
|
|
||
| unset GIT_PAGER GIT_PAGER_IN_USE | ||
| git config --unset core.pager | ||
| PAGER='cat > paginated.out' | ||
| export PAGER | ||
|
|
||
| test_expect_success 'setup' ' | ||
| test_commit initial | ||
| ' | ||
|
|
||
| rm -f paginated.out | ||
| test_expect_success TTY 'some commands use a pager' ' | ||
| test_terminal git log && | ||
| test -e paginated.out | ||
| ' | ||
|
|
||
| rm -f paginated.out | ||
| test_expect_success TTY 'some commands do not use a pager' ' | ||
| test_terminal git rev-list HEAD && | ||
| ! test -e paginated.out | ||
| ' | ||
|
|
||
| rm -f paginated.out | ||
| test_expect_success 'no pager when stdout is a pipe' ' | ||
| git log | cat && | ||
| ! test -e paginated.out | ||
| ' | ||
|
|
||
| rm -f paginated.out | ||
| test_expect_success 'no pager when stdout is a regular file' ' | ||
| git log > file && | ||
| ! test -e paginated.out | ||
| ' | ||
|
|
||
| rm -f paginated.out | ||
| test_expect_success TTY 'git --paginate rev-list uses a pager' ' | ||
| test_terminal git --paginate rev-list HEAD && | ||
| test -e paginated.out | ||
| ' | ||
|
|
||
| rm -f file paginated.out | ||
| test_expect_success 'no pager even with --paginate when stdout is a pipe' ' | ||
| git --paginate log | cat && | ||
| ! test -e paginated.out | ||
| ' | ||
|
|
||
| rm -f paginated.out | ||
| test_expect_success TTY 'no pager with --no-pager' ' | ||
| test_terminal git --no-pager log && | ||
| ! test -e paginated.out | ||
| ' | ||
|
|
||
| # A colored commit log will begin with an appropriate ANSI escape | ||
| # for the first color; the text "commit" comes later. | ||
| colorful() { | ||
| read firstline < $1 | ||
| ! expr "$firstline" : "^[a-zA-Z]" >/dev/null | ||
| } | ||
|
|
||
| rm -f colorful.log colorless.log | ||
| test_expect_success 'tests can detect color' ' | ||
| git log --no-color > colorless.log && | ||
| git log --color > colorful.log && | ||
| ! colorful colorless.log && | ||
| colorful colorful.log | ||
| ' | ||
|
|
||
| rm -f colorless.log | ||
| git config color.ui auto | ||
| test_expect_success 'no color when stdout is a regular file' ' | ||
| git log > colorless.log && | ||
| ! colorful colorless.log | ||
| ' | ||
|
|
||
| rm -f paginated.out | ||
| git config color.ui auto | ||
| test_expect_success TTY 'color when writing to a pager' ' | ||
| TERM=vt100 test_terminal git log && | ||
| colorful paginated.out | ||
| ' | ||
|
|
||
| rm -f colorful.log | ||
| git config color.ui auto | ||
| test_expect_success 'color when writing to a file intended for a pager' ' | ||
| TERM=vt100 GIT_PAGER_IN_USE=true git log > colorful.log && | ||
| colorful colorful.log | ||
| ' | ||
|
|
||
| unset PAGER GIT_PAGER | ||
| git config --unset core.pager | ||
| test_expect_success 'determine default pager' ' | ||
| less=$(git var GIT_PAGER) && | ||
| test -n "$less" | ||
| ' | ||
|
|
||
| if expr "$less" : '^[a-z]*$' > /dev/null && test_have_prereq TTY | ||
| then | ||
| test_set_prereq SIMPLEPAGER | ||
| fi | ||
|
|
||
| unset PAGER GIT_PAGER | ||
| git config --unset core.pager | ||
| rm -f default_pager_used | ||
| test_expect_success SIMPLEPAGER 'default pager is used by default' ' | ||
| cat > $less <<-EOF && | ||
| #!$SHELL_PATH | ||
| wc > default_pager_used | ||
| EOF | ||
| chmod +x $less && | ||
| PATH=.:$PATH test_terminal git log && | ||
| test -e default_pager_used | ||
| ' | ||
|
|
||
| unset GIT_PAGER | ||
| git config --unset core.pager | ||
| rm -f PAGER_used | ||
| test_expect_success TTY 'PAGER overrides default pager' ' | ||
| PAGER="wc > PAGER_used" && | ||
| export PAGER && | ||
| test_terminal git log && | ||
| test -e PAGER_used | ||
| ' | ||
|
|
||
| unset GIT_PAGER | ||
| rm -f core.pager_used | ||
| test_expect_success TTY 'core.pager overrides PAGER' ' | ||
| PAGER=wc && | ||
| export PAGER && | ||
| git config core.pager "wc > core.pager_used" && | ||
| test_terminal git log && | ||
| test -e core.pager_used | ||
| ' | ||
|
|
||
| rm -f GIT_PAGER_used | ||
| test_expect_success TTY 'GIT_PAGER overrides core.pager' ' | ||
| git config core.pager wc && | ||
| GIT_PAGER="wc > GIT_PAGER_used" && | ||
| export GIT_PAGER && | ||
| test_terminal git log && | ||
| test -e GIT_PAGER_used | ||
| ' | ||
|
|
||
| test_done |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,58 @@ | ||
| #!/usr/bin/perl | ||
| use strict; | ||
| use warnings; | ||
| use IO::Pty; | ||
| use File::Copy; | ||
|
|
||
| # Run @$argv in the background with stdout redirected to $out. | ||
| sub start_child { | ||
| my ($argv, $out) = @_; | ||
| my $pid = fork; | ||
| if (not defined $pid) { | ||
| die "fork failed: $!" | ||
| } elsif ($pid == 0) { | ||
| open STDOUT, ">&", $out; | ||
| close $out; | ||
| exec(@$argv) or die "cannot exec '$argv->[0]': $!" | ||
| } | ||
| return $pid; | ||
| } | ||
|
|
||
| # Wait for $pid to finish. | ||
| sub finish_child { | ||
| # Simplified from wait_or_whine() in run-command.c. | ||
| my ($pid) = @_; | ||
|
|
||
| my $waiting = waitpid($pid, 0); | ||
| if ($waiting < 0) { | ||
| die "waitpid failed: $!"; | ||
| } elsif ($? & 127) { | ||
| my $code = $? & 127; | ||
| warn "died of signal $code"; | ||
| return $code - 128; | ||
| } else { | ||
| return $? >> 8; | ||
| } | ||
| } | ||
|
|
||
| sub xsendfile { | ||
| my ($out, $in) = @_; | ||
|
|
||
| # Note: the real sendfile() cannot read from a terminal. | ||
|
|
||
| # It is unspecified by POSIX whether reads | ||
| # from a disconnected terminal will return | ||
| # EIO (as in AIX 4.x, IRIX, and Linux) or | ||
| # end-of-file. Either is fine. | ||
| copy($in, $out, 4096) or $!{EIO} or die "cannot copy from child: $!"; | ||
| } | ||
|
|
||
| if ($#ARGV < 1) { | ||
| die "usage: test-terminal program args"; | ||
| } | ||
| my $master = new IO::Pty; | ||
| my $slave = $master->slave; | ||
| my $pid = start_child(\@ARGV, $slave); | ||
| close $slave; | ||
| xsendfile(\*STDOUT, $master); | ||
| exit(finish_child($pid)); |