correct and tighten up .*ignore files

* .cvsignore: Don't ignore *.orig or *.rej.  They're not build products.
Don't ignore the entire m4 directory.
* Makefile.maint (sync-vcs-ignore-files): Correct quoting.
Use sed rather than a for loop.
Search only version-controled files (for reproducibility)
* gnulib/lib/netinet/.cvsignore: Append missing newline-at-EOF,
so that the use of sed doesn't mistakenly concatenate lines.
* gnulib/lib/sys/.cvsignore: Likewise.
* m4/.cvsignore: Ignore acinclude.m4 and aclocal.m4, not *.m4.
* .hgignore: Regenerate.
* all .gitignore files: Regenerate.

diff --git a/.cvsignore b/.cvsignore
index ecb8bf023f92b3ac37dddbb954336d3821b9095e..1b366948205fe272dfa59c66eef7be7597231432 100644 (file)
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,7 +1,5 @@
 *.a
 *.o
-*.orig
-*.rej
 *~
 .git
 ABOUT-NLS
@@ -27,7 +25,6 @@ libvirt.pc
 libvirt.spec
 ltconfig
 ltmain.sh
-m4
 mingw32-libvirt.spec
 mkinstalldirs
 results.log

diff --git a/.gitignore b/.gitignore
index ecb8bf023f92b3ac37dddbb954336d3821b9095e..1b366948205fe272dfa59c66eef7be7597231432 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,5 @@
 *.a
 *.o
-*.orig
-*.rej
 *~
 .git
 ABOUT-NLS
@@ -27,7 +25,6 @@ libvirt.pc
 libvirt.spec
 ltconfig
 ltmain.sh
-m4
 mingw32-libvirt.spec
 mkinstalldirs
 results.log

diff --git a/.hgignore b/.hgignore
index 728e7e7344c6cf5762c86465c6e7baf6830c5b8d..5fe04cd104aad09a9523ee08588c5a4557dd76ef 100644 (file)
--- a/.hgignore
+++ b/.hgignore
@@ -1,245 +1,242 @@
 syntax: glob
-./proxy/Makefile
-./proxy/Makefile.in
-./proxy/.deps
-./proxy/.libs
-./proxy/libvirt_proxy
-./build-aux/compile
-./build-aux/config.guess
-./build-aux/config.rpath
-./build-aux/config.sub
-./build-aux/depcomp
-./build-aux/install-sh
-./build-aux/ltmain.sh
-./build-aux/missing
-./build-aux/mkinstalldirs
-./build-aux/mktempd
-./qemud/*.gcda
-./qemud/*.gcno
-./qemud/*.la
-./qemud/*.lo
-./qemud/.deps
-./qemud/.libs
-./qemud/Makefile
-./qemud/Makefile.in
-./qemud/libvirt_qemud
-./qemud/libvirtd
-./qemud/libvirtd.init
-./qemud/libvirtd.logrotate
-./m4/acinclude.m4
-./m4/aclocal.m4
-./m4/Makefile
-./m4/Makefile.in
-./docs/devhelp/Makefile
-./docs/devhelp/Makefile.in
-./docs/devhelp/libvirt.devhelp
-./docs/examples/.memdump
-./docs/examples/Makefile.in
-./docs/examples/Makefile
-./docs/examples/.deps
-./docs/examples/.libs
-./docs/examples/info1
-./docs/examples/suspend
-./docs/examples/python/Makefile
-./docs/examples/python/Makefile.in
-./docs/Makefile
-./docs/Makefile.in
-./docs/.memdump
-./docs/apibuild.pyc
-./po/stamp-po
-./po/remove-potcdate.sin
-./po/quot.sed
-./po/insert-header.sin
-./po/*.gmo
-./po/en@quot.header
-./po/en@boldquot.header
-./po/boldquot.sed
-./po/Rules-quot
-./po/POTFILES
-./po/Makevars.template
-./po/Makefile.in.in
-./po/Makefile.in
-./po/Makefile
-./po/remove-potcdate.sed
-./gnulib/lib/arpa/inet.h
-./gnulib/lib/sys/select.h
-./gnulib/lib/sys/socket.h
-./gnulib/lib/sys/stat.h
-./gnulib/lib/sys/time.h
-./gnulib/lib/alloca.h
-./gnulib/lib/arpa_inet.h
-./gnulib/lib/.deps
-./gnulib/lib/errno.h
-./gnulib/lib/float.h
-./gnulib/lib/*.la
-./gnulib/lib/.libs
-./gnulib/lib/*.lo
-./gnulib/lib/Makefile
-./gnulib/lib/Makefile.in
-./gnulib/lib/netdb.h
-./gnulib/lib/netinet_in.h
-./gnulib/lib/poll.h
-./gnulib/lib/stdbool.h
-./gnulib/lib/stdint.h
-./gnulib/lib/stdio.h
-./gnulib/lib/stdlib.h
-./gnulib/lib/string.h
-./gnulib/lib/sys_ioctl.h
-./gnulib/lib/sys_select.h
-./gnulib/lib/sys_socket.h
-./gnulib/lib/sys_stat.h
-./gnulib/lib/sys_time.h
-./gnulib/lib/time.h
-./gnulib/lib/unistd.h
-./gnulib/lib/wchar.h
-./gnulib/lib/netinet/in.h
-./gnulib/tests/.deps
-./gnulib/tests/.libs
-./gnulib/tests/Makefile
-./gnulib/tests/Makefile.in
-./gnulib/tests/sys
-./gnulib/tests/test-EOVERFLOW
-./gnulib/tests/test-alloca-opt
-./gnulib/tests/test-arpa_inet
-./gnulib/tests/test-c-ctype
-./gnulib/tests/test-errno
-./gnulib/tests/test-fseeko
-./gnulib/tests/test-getaddrinfo
-./gnulib/tests/test-getdelim
-./gnulib/tests/test-gethostname
-./gnulib/tests/test-getline
-./gnulib/tests/test-gettimeofday
-./gnulib/tests/test-lseek
-./gnulib/tests/test-lstat
-./gnulib/tests/test-netdb
-./gnulib/tests/test-netinet_in
-./gnulib/tests/test-perror
-./gnulib/tests/test-poll
-./gnulib/tests/test-random_r
-./gnulib/tests/test-snprintf
-./gnulib/tests/test-sockets
-./gnulib/tests/test-stdbool
-./gnulib/tests/test-stdint
-./gnulib/tests/test-stdio
-./gnulib/tests/test-stdlib
-./gnulib/tests/test-strerror
-./gnulib/tests/test-string
-./gnulib/tests/test-sys_select
-./gnulib/tests/test-sys_socket
-./gnulib/tests/test-sys_stat
-./gnulib/tests/test-sys_time
-./gnulib/tests/test-unistd
-./gnulib/tests/test-vasnprintf
-./gnulib/tests/test-vasprintf
-./gnulib/tests/test-wchar
-./gnulib/tests/test-time
-./examples/domain-events/events-c/Makefile
-./examples/domain-events/events-c/Makefile.in
-./examples/domain-events/events-c/*.exe
-./examples/domain-events/events-c/.deps
-./examples/domain-events/events-c/.libs
-./examples/domain-events/events-c/event-test
-./src/Makefile
-./src/Makefile.in
-./src/.deps
-./src/.libs
-./src/*.lo
-./src/*.loT
-./src/*.la
-./src/virsh
-./src/*.exe
-./src/*.gcda
-./src/*.gcno
-./src/*.gcov
-./src/*.cov
-./src/libvirt_parthelper
-./src/libvirt_lxc
-./src/virsh-net-edit.c
-./src/virsh-pool-edit.c
-./src/libvirt.syms
-./*.a
-./*.o
-./ChangeLog.orig
-./ChangeLog.rej
-./*~
-./.git
-./ABOUT-NLS
-./COPYING
-./INSTALL
-./Makefile
-./Makefile.in
-./aclocal.m4
-./autom4te.cache
-./config.cache
-./config.guess
-./config.h
-./config.h.in
-./config.log
-./config.rpath
-./config.status
-./config.sub
-./configure
-./coverage
-./libtool
-./libvirt-*.tar.gz
-./libvirt.pc
-./libvirt.spec
-./ltconfig
-./ltmain.sh
-./m4
-./mingw32-libvirt.spec
-./mkinstalldirs
-./results.log
-./stamp-h
-./stamp-h.in
-./stamp-h1
-./update.log
-./python/Makefile
-./python/Makefile.in
-./python/.deps
-./python/.libs
-./python/*.lo
-./python/*.la
-./python/*.loT
-./python/libvirt.py
-./python/libvirt-export.c
-./python/libvirtclass.txt
-./python/libvirt-py.[ch]
-./python/libvirtclass.py
-./python/gen_prog
-./python/*.pyc
-./python/tests/Makefile
-./python/tests/Makefile.in
-./tests/xml2sexprdata/Makefile
-./tests/xml2sexprdata/Makefile.in
-./tests/sexpr2xmldata/Makefile
-./tests/sexpr2xmldata/Makefile.in
-./tests/confdata/Makefile
-./tests/confdata/Makefile.in
-./tests/xmconfigdata/Makefile
-./tests/xmconfigdata/Makefile.in
-./tests/Makefile
-./tests/Makefile.in
-./tests/.deps
-./tests/.libs
-./tests/sexpr2xmltest
-./tests/xml2sexprtest
-./tests/virshtest
-./tests/conftest
-./tests/reconnect
-./tests/xmconfigtest
-./tests/xencapstest
-./tests/qemuxml2xmltest
-./tests/qemuxml2argvtest
-./tests/nodeinfotest
-./tests/statstest
-./tests/qparamtest
-./tests/*.gcda
-./tests/*.gcno
-./tests/*.exe
-./tests/xencapsdata/Makefile
-./tests/xencapsdata/Makefile.in
-./include/libvirt/Makefile
-./include/libvirt/Makefile.in
-./include/Makefile
-./include/Makefile.in
+*.a
+*.o
+*~
+.git
+ABOUT-NLS
+COPYING
+INSTALL
+Makefile
+Makefile.in
+aclocal.m4
+autom4te.cache
+build-aux/compile
+build-aux/config.guess
+build-aux/config.rpath
+build-aux/config.sub
+build-aux/depcomp
+build-aux/install-sh
+build-aux/ltmain.sh
+build-aux/missing
+build-aux/mkinstalldirs
+build-aux/mktempd
+config.cache
+config.guess
+config.h
+config.h.in
+config.log
+config.rpath
+config.status
+config.sub
+configure
+coverage
+docs/.memdump
+docs/Makefile
+docs/Makefile.in
+docs/apibuild.pyc
+docs/devhelp/Makefile
+docs/devhelp/Makefile.in
+docs/devhelp/libvirt.devhelp
+docs/examples/.deps
+docs/examples/.libs
+docs/examples/.memdump
+docs/examples/Makefile
+docs/examples/Makefile.in
+docs/examples/info1
+docs/examples/python/Makefile
+docs/examples/python/Makefile.in
+docs/examples/suspend
+examples/domain-events/events-c/*.exe
+examples/domain-events/events-c/.deps
+examples/domain-events/events-c/.libs
+examples/domain-events/events-c/Makefile
+examples/domain-events/events-c/Makefile.in
+examples/domain-events/events-c/event-test
+gnulib/lib/*.la
+gnulib/lib/*.lo
+gnulib/lib/.deps
+gnulib/lib/.libs
+gnulib/lib/Makefile
+gnulib/lib/Makefile.in
+gnulib/lib/alloca.h
+gnulib/lib/arpa/inet.h
+gnulib/lib/arpa_inet.h
+gnulib/lib/errno.h
+gnulib/lib/float.h
+gnulib/lib/netdb.h
+gnulib/lib/netinet/in.h
+gnulib/lib/netinet_in.h
+gnulib/lib/poll.h
+gnulib/lib/stdbool.h
+gnulib/lib/stdint.h
+gnulib/lib/stdio.h
+gnulib/lib/stdlib.h
+gnulib/lib/string.h
+gnulib/lib/sys/select.h
+gnulib/lib/sys/socket.h
+gnulib/lib/sys/stat.h
+gnulib/lib/sys/time.h
+gnulib/lib/sys_ioctl.h
+gnulib/lib/sys_select.h
+gnulib/lib/sys_socket.h
+gnulib/lib/sys_stat.h
+gnulib/lib/sys_time.h
+gnulib/lib/time.h
+gnulib/lib/unistd.h
+gnulib/lib/wchar.h
+gnulib/tests/.deps
+gnulib/tests/.libs
+gnulib/tests/Makefile
+gnulib/tests/Makefile.in
+gnulib/tests/sys
+gnulib/tests/test-EOVERFLOW
+gnulib/tests/test-alloca-opt
+gnulib/tests/test-arpa_inet
+gnulib/tests/test-c-ctype
+gnulib/tests/test-errno
+gnulib/tests/test-fseeko
+gnulib/tests/test-getaddrinfo
+gnulib/tests/test-getdelim
+gnulib/tests/test-gethostname
+gnulib/tests/test-getline
+gnulib/tests/test-gettimeofday
+gnulib/tests/test-lseek
+gnulib/tests/test-lstat
+gnulib/tests/test-netdb
+gnulib/tests/test-netinet_in
+gnulib/tests/test-perror
+gnulib/tests/test-poll
+gnulib/tests/test-random_r
+gnulib/tests/test-snprintf
+gnulib/tests/test-sockets
+gnulib/tests/test-stdbool
+gnulib/tests/test-stdint
+gnulib/tests/test-stdio
+gnulib/tests/test-stdlib
+gnulib/tests/test-strerror
+gnulib/tests/test-string
+gnulib/tests/test-sys_select
+gnulib/tests/test-sys_socket
+gnulib/tests/test-sys_stat
+gnulib/tests/test-sys_time
+gnulib/tests/test-time
+gnulib/tests/test-unistd
+gnulib/tests/test-vasnprintf
+gnulib/tests/test-vasprintf
+gnulib/tests/test-wchar
+include/Makefile
+include/Makefile.in
+include/libvirt/Makefile
+include/libvirt/Makefile.in
+libtool
+libvirt-*.tar.gz
+libvirt.pc
+libvirt.spec
+ltconfig
+ltmain.sh
+m4/Makefile
+m4/Makefile.in
+m4/acinclude.m4
+m4/aclocal.m4
+mingw32-libvirt.spec
+mkinstalldirs
+po/*.gmo
+po/Makefile
+po/Makefile.in
+po/Makefile.in.in
+po/Makevars.template
+po/POTFILES
+po/Rules-quot
+po/boldquot.sed
+po/en@boldquot.header
+po/en@quot.header
+po/insert-header.sin
+po/quot.sed
+po/remove-potcdate.sed
+po/remove-potcdate.sin
+po/stamp-po
+proxy/.deps
+proxy/.libs
+proxy/Makefile
+proxy/Makefile.in
+proxy/libvirt_proxy
+python/*.la
+python/*.lo
+python/*.loT
+python/*.pyc
+python/.deps
+python/.libs
+python/Makefile
+python/Makefile.in
+python/gen_prog
+python/libvirt-export.c
+python/libvirt-py.[ch]
+python/libvirt.py
+python/libvirtclass.py
+python/libvirtclass.txt
+python/tests/Makefile
+python/tests/Makefile.in
+qemud/*.gcda
+qemud/*.gcno
+qemud/*.la
+qemud/*.lo
+qemud/.deps
+qemud/.libs
+qemud/Makefile
+qemud/Makefile.in
+qemud/libvirt_qemud
+qemud/libvirtd
+qemud/libvirtd.init
+qemud/libvirtd.logrotate
+results.log
+src/*.cov
+src/*.exe
+src/*.gcda
+src/*.gcno
+src/*.gcov
+src/*.la
+src/*.lo
+src/*.loT
+src/.deps
+src/.libs
+src/Makefile
+src/Makefile.in
+src/libvirt.syms
+src/libvirt_lxc
+src/libvirt_parthelper
+src/virsh
+src/virsh-net-edit.c
+src/virsh-pool-edit.c
+stamp-h
+stamp-h.in
+stamp-h1
+tests/*.exe
+tests/*.gcda
+tests/*.gcno
+tests/.deps
+tests/.libs
+tests/Makefile
+tests/Makefile.in
+tests/confdata/Makefile
+tests/confdata/Makefile.in
+tests/conftest
+tests/nodeinfotest
+tests/qemuxml2argvtest
+tests/qemuxml2xmltest
+tests/qparamtest
+tests/reconnect
+tests/sexpr2xmldata/Makefile
+tests/sexpr2xmldata/Makefile.in
+tests/sexpr2xmltest
+tests/statstest
+tests/virshtest
+tests/xencapsdata/Makefile
+tests/xencapsdata/Makefile.in
+tests/xencapstest
+tests/xmconfigdata/Makefile
+tests/xmconfigdata/Makefile.in
+tests/xmconfigtest
+tests/xml2sexprdata/Makefile
+tests/xml2sexprdata/Makefile.in
+tests/xml2sexprtest
+update.log

diff --git a/ChangeLog b/ChangeLog
index 7f441dd903e475f227963f74ad4142ccc7f6fb6e..86582f3ae06df2f1f64b8be43e929a9fc1124c81 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+Fri Jan 23 14:30:59 +0100 2009 Jim Meyering <meyering@redhat.com>
+
+       correct and tighten up .*ignore files
+       * .cvsignore: Don't ignore *.orig or *.rej.  They're not build products.
+       Don't ignore the entire m4 directory.
+       * Makefile.maint (sync-vcs-ignore-files): Correct quoting.
+       Use sed rather than a for loop.
+       Search only version-controled files (for reproducibility)
+       * gnulib/lib/netinet/.cvsignore: Append missing newline-at-EOF,
+       so that the use of sed doesn't mistakenly concatenate lines.
+       * gnulib/lib/sys/.cvsignore: Likewise.
+       * m4/.cvsignore: Ignore acinclude.m4 and aclocal.m4, not *.m4.
+       * .hgignore: Regenerate.
+       * all .gitignore files: Regenerate.
+
 Fri Jan 23 12:44:44 +0100 2009 Jim Meyering <meyering@redhat.com>
 
        maint: update list of error function names and adapt

diff --git a/Makefile.maint b/Makefile.maint
index ba7db9bbc2aa5e191fdfdc72c722dce457a85993..204370d39937d0cf1a2964099883189cdaf3f909 100644 (file)
--- a/Makefile.maint
+++ b/Makefile.maint
@@ -718,9 +718,9 @@ sync-vcs-ignore-files:
        perl $(c2g)
        rm -f $(c2g)
        echo "syntax: glob" > .hgignore
-       for ignore in `find $(srcdir) -name .gitignore`; do \
-           dir=`dirname $$ignore`; \
-           for rule in `cat $$ignore`; do \
-               echo "$$dir/$$rule" >> .hgignore; \
-           done ; \
-       done
+       ( for ignore in $$($(VC_LIST)                           \
+                          | grep -E '(^|/)\.gitignore$$'); do  \
+           dir=$$(dirname "$$ignore");                         \
+           test "$$dir" = . && pfx= || pfx=$$dir/;             \
+           sed "s!^!$$pfx!" "$$ignore";                        \
+         done ) | sort -u >> .hgignore

diff --git a/gnulib/lib/.cvsignore b/gnulib/lib/.cvsignore
index ba817ae0b46ee083329691dc14b6b2a90f7c0287..9d6b35f849bc5e75548573969e708d5a9e511594 100644 (file)
--- a/gnulib/lib/.cvsignore
+++ b/gnulib/lib/.cvsignore
@@ -1,13 +1,13 @@
-alloca.h
-arpa_inet.h
-.deps
-errno.h
-float.h
 *.la
-.libs
 *.lo
+.deps
+.libs
 Makefile
 Makefile.in
+alloca.h
+arpa_inet.h
+errno.h
+float.h
 netdb.h
 netinet_in.h
 poll.h

diff --git a/gnulib/lib/.gitignore b/gnulib/lib/.gitignore
index ba817ae0b46ee083329691dc14b6b2a90f7c0287..9d6b35f849bc5e75548573969e708d5a9e511594 100644 (file)
--- a/gnulib/lib/.gitignore
+++ b/gnulib/lib/.gitignore
@@ -1,13 +1,13 @@
-alloca.h
-arpa_inet.h
-.deps
-errno.h
-float.h
 *.la
-.libs
 *.lo
+.deps
+.libs
 Makefile
 Makefile.in
+alloca.h
+arpa_inet.h
+errno.h
+float.h
 netdb.h
 netinet_in.h
 poll.h

diff --git a/gnulib/lib/netinet/.cvsignore b/gnulib/lib/netinet/.cvsignore
index 95f1a2e3240f1eb2ba8f802703906a65d6724b67..00fea9e8c8e40f04f94329455ec17c2aa0f66559 100644 (file)
--- a/gnulib/lib/netinet/.cvsignore
+++ b/gnulib/lib/netinet/.cvsignore
@@ -1 +1 @@
-in.h
\ No newline at end of file
+in.h

diff --git a/gnulib/lib/netinet/.gitignore b/gnulib/lib/netinet/.gitignore
index 95f1a2e3240f1eb2ba8f802703906a65d6724b67..00fea9e8c8e40f04f94329455ec17c2aa0f66559 100644 (file)
--- a/gnulib/lib/netinet/.gitignore
+++ b/gnulib/lib/netinet/.gitignore
@@ -1 +1 @@
-in.h
\ No newline at end of file
+in.h

diff --git a/gnulib/lib/sys/.cvsignore b/gnulib/lib/sys/.cvsignore
index f6e392faf174a4c6e0d38666f3e7f7c6511df11e..62c8ffb398b87f07dada594e683f5898fb8ca8b5 100644 (file)
--- a/gnulib/lib/sys/.cvsignore
+++ b/gnulib/lib/sys/.cvsignore
@@ -1,4 +1,4 @@
 select.h
 socket.h
 stat.h
-time.h
\ No newline at end of file
+time.h

diff --git a/gnulib/lib/sys/.gitignore b/gnulib/lib/sys/.gitignore
index f6e392faf174a4c6e0d38666f3e7f7c6511df11e..62c8ffb398b87f07dada594e683f5898fb8ca8b5 100644 (file)
--- a/gnulib/lib/sys/.gitignore
+++ b/gnulib/lib/sys/.gitignore
@@ -1,4 +1,4 @@
 select.h
 socket.h
 stat.h
-time.h
\ No newline at end of file
+time.h

diff --git a/m4/.cvsignore b/m4/.cvsignore
index 0063d7a83c25f19b0025c3527a79bdcec456e713..09797f078085401a2d7f284a2835c36866e65dc1 100644 (file)
--- a/m4/.cvsignore
+++ b/m4/.cvsignore
@@ -1,3 +1,4 @@
-*.m4
 Makefile
 Makefile.in
+acinclude.m4
+aclocal.m4

diff --git a/m4/.gitignore b/m4/.gitignore
index 0063d7a83c25f19b0025c3527a79bdcec456e713..09797f078085401a2d7f284a2835c36866e65dc1 100644 (file)
--- a/m4/.gitignore
+++ b/m4/.gitignore
@@ -1,3 +1,4 @@
-*.m4
 Makefile
 Makefile.in
+acinclude.m4
+aclocal.m4