summaryrefslogtreecommitdiff
path: root/git-difftool.perl
diff options
context:
space:
mode:
authorDavid Aguilar <davvid@gmail.com>2012-07-23 03:57:07 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-07-23 04:39:57 (GMT)
commit35989c68ee5f577ae959f69281e456fd14460469 (patch)
tree3cd0e7a7bcf33d29474b9864c54500e132657811 /git-difftool.perl
parent05df532655e14ba351b4ee8a0acd8f190ed0b745 (diff)
downloadgit-35989c68ee5f577ae959f69281e456fd14460469.zip
git-35989c68ee5f577ae959f69281e456fd14460469.tar.gz
git-35989c68ee5f577ae959f69281e456fd14460469.tar.bz2
difftool: Simplify print_tool_help()
Eliminate a global variable and File::Find usage by building upon basename() and glob() instead. Signed-off-by: David Aguilar <davvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-difftool.perl')
-rwxr-xr-xgit-difftool.perl25
1 files changed, 5 insertions, 20 deletions
diff --git a/git-difftool.perl b/git-difftool.perl
index c079854..ac0ed63 100755
--- a/git-difftool.perl
+++ b/git-difftool.perl
@@ -13,17 +13,15 @@
use 5.008;
use strict;
use warnings;
-use File::Basename qw(dirname);
+use File::Basename qw(basename dirname);
use File::Copy;
use File::Compare;
-use File::Find;
use File::stat;
use File::Path qw(mkpath);
use File::Temp qw(tempdir);
use Getopt::Long qw(:config pass_through);
use Git;
-my @tools;
my @working_tree;
my $rc;
my $repo = Git->repository();
@@ -65,26 +63,13 @@ sub find_worktree
my $workdir = find_worktree();
-sub filter_tool_scripts
-{
- if (-d $_) {
- if ($_ ne ".") {
- # Ignore files in subdirectories
- $File::Find::prune = 1;
- }
- } else {
- if ((-f $_) && ($_ ne "defaults")) {
- push(@tools, $_);
- }
- }
-}
-
sub print_tool_help
{
my ($cmd, @found, @notfound);
my $gitpath = Git::exec_path();
- find(\&filter_tool_scripts, "$gitpath/mergetools");
+ my @files = map { basename($_) } glob("$gitpath/mergetools/*");
+ my @tools = sort(grep { !m{^defaults$} } @files);
foreach my $tool (@tools) {
$cmd = "TOOL_MODE=diff";
@@ -99,10 +84,10 @@ sub print_tool_help
}
print "'git difftool --tool=<tool>' may be set to one of the following:\n";
- print "\t$_\n" for (sort(@found));
+ print "\t$_\n" for (@found);
print "\nThe following tools are valid, but not currently available:\n";
- print "\t$_\n" for (sort(@notfound));
+ print "\t$_\n" for (@notfound);
print "\nNOTE: Some of the tools listed above only work in a windowed\n";
print "environment. If run in a terminal-only session, they will fail.\n";