summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim Meyering <meyering@redhat.com>2008-01-31 11:27:15 +0100
committerJim Meyering <meyering@redhat.com>2008-01-31 12:17:07 +0100
commit9a0b4599c7cbc15151e591402033953b63ebd2c2 (patch)
tree6291ecdd231e2dd8944872d42893515546f7a976
parent49d22be1a66b86c57c854946f85c86fa439908f9 (diff)
downloadcoreutils-9a0b4599c7cbc15151e591402033953b63ebd2c2.tar.xz
Pull vc-list-files from gnulib.
* bootstrap.conf (gnulib_modules): Add vc-list-files. * build-aux/vc-list-files: Remove file.
-rw-r--r--ChangeLog4
-rw-r--r--bootstrap.conf3
-rw-r--r--build-aux/.gitignore1
-rwxr-xr-xbuild-aux/vc-list-files50
4 files changed, 7 insertions, 51 deletions
diff --git a/ChangeLog b/ChangeLog
index 205ef07f4..bfa8c2d17 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2008-01-31 Jim Meyering <meyering@redhat.com>
+ Pull vc-list-files from gnulib.
+ * bootstrap.conf (gnulib_modules): Add vc-list-files.
+ * build-aux/vc-list-files: Remove file.
+
Improve the cp/parent-perm test.
* tests/cp/parent-perm: Also check that perms of existing dest
dirs are changed to match those of corresponding src dir
diff --git a/bootstrap.conf b/bootstrap.conf
index 090945026..92bee986d 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -1,6 +1,6 @@
# Bootstrap configuration.
-# Copyright (C) 2006, 2007 Free Software Foundation, Inc.
+# Copyright (C) 2006-2008 Free Software Foundation, Inc.
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -83,6 +83,7 @@ gnulib_modules="
unicodeio unistd-safer unlink-busy unlinkdir unlocked-io
uptime userspec utimecmp utimens
vasprintf-posix
+ vc-list-files
verify version-etc-fsf
wcwidth winsz-ioctl winsz-termios write-any-file
xalloc xgetcwd xgethostname
diff --git a/build-aux/.gitignore b/build-aux/.gitignore
index 35c787cf7..1218be5d6 100644
--- a/build-aux/.gitignore
+++ b/build-aux/.gitignore
@@ -11,4 +11,5 @@ link-warning.h
mdate-sh
missing
texinfo.tex
+vc-list-files
ylwrap
diff --git a/build-aux/vc-list-files b/build-aux/vc-list-files
deleted file mode 100755
index 72a6f549c..000000000
--- a/build-aux/vc-list-files
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/bin/sh
-# List the specified version-controlled files.
-
-# Copyright (C) 2006, 2007 Free Software Foundation, Inc.
-
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-
-# List the specified version-controlled files.
-# With no argument, list them all.
-# This script must be run solely from the top of a $srcdir build directory.
-
-# If there's an argument, it must be a single, "."-relative directory name.
-# cvsu is part of the cvsutils package: http://www.red-bean.com/cvsutils/
-
-dir=
-case $# in
- 0) ;;
- 1) dir=$1 ;;
- *) echo "$0: too many arguments" 1>&2; exit 1 ;;
-esac
-
-test "x$dir" = x && dir=.
-
-if test -d CVS; then
- if test -x build-aux/cvsu; then
- build-aux/cvsu --find --types=AFGM "$dir"
- else
- awk -F/ '{ \
- if (!$1 && $3 !~ /^-/) { \
- f=FILENAME; \
- sub(/CVS\/Entries/, "", f); \
- print f $2; \
- }}' \
- $(find ${*-*} -name Entries -print) /dev/null;
- fi
-else
- git-ls-files "$dir"
-fi