summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* diffutils.morph: use PREFIX if setbaserock/bootstrapRichard Maw2012-03-141-1/+1
|
* DESTDIR change in installbaserock/bootstrap-stableAdnan Ali2012-01-311-1/+1
|
* Turn gnulib subrepository into a regular directoryRichard Maw2012-01-098690-0/+881744
|
* remove bootstrap from morphRichard Maw2012-01-091-1/+0
|
* bootstrapped repositoryRichard Maw2012-01-09743-0/+291653
|
* add morphRichard Maw2012-01-091-0/+14
|
* New option --no-dereference.Bruno Haible2012-01-086-4/+257
| | | | | | | | | | | | | | | * src/diff.h (no_dereference_symlinks): New variable. * src/diff.c: Include xreadlink.h. (longopts): Add --no-dereference option. (main): Accept --no-dereference option. (option_help_msgid): Mention the --no-dereference option. (compare_files): If no_dereference_symlinks is true, use lstat() instead of stat(). Compare symbolic links by comparing their values. * bootstrap.conf (gnulib_modules): Add lstat, stat, xreadlink. * doc/diffutils.texi (Comparing Directories, diff Options): Mention the --no-dereference option. * tests/no-dereference: New file. * tests/Makefile.am (TESTS): Add it.
* maint: update all copyright year number rangesJim Meyering2012-01-0146-47/+46
| | | | Run "make update-copyright".
* build: update to latest gnulib and adaptJim Meyering2011-12-1410-10/+11
| | | | | | | | | | | | | | | | | * tests/binary: Reverse arguments to compare to avoid failure of new syntax-check rule. * configure.ac: Use -Wno-format-nonliteral. Mark functions as pure of const, per recommendations enabled by new gcc -W options. Use _GL_ATTRIBUTE_PURE and _GL_ATTRIBUTE_CONST. * lib/cmpbuf.h (buffer_lcm, block_compare): Apply pure and/or const attributes. * src/cmp.c (block_compare): Likewise. * src/context.c (find_hunk): Likewise. * src/diff.h (lines_differ): Likewise. * src/diff3.c (skipwhite): Likewise. * src/dir.c (dir_loop): Likewise. * src/util.c (find_change, find_reverse_change): Likewise. (translate_line_number): Likewise.
* build: stop distributing gzip'd releases; xz is enoughJim Meyering2011-12-141-1/+1
| | | | * configure.ac (AM_INIT_AUTOMAKE): Add no-dist-gzip.
* tests: use "compare exp out", not "compare out exp"Jim Meyering2011-11-297-13/+13
| | | | | | | | | | | | | | | | | | | | | Likewise, when an empty file is expected, use "compare /dev/null out", not "compare out /dev/null". I.e., specify the expected/desired contents via the first file name. Prompted by a suggestion from Bruno Haible in http://thread.gmane.org/gmane.comp.gnu.grep.bugs/4020/focus=29154 Run these commands: git grep -l -E 'compare [^ ]+ exp' \ |xargs perl -pi -e 's/\b(compare) (\S+) (exp\S*)/$1 $3 $2/' git grep -l -E 'compare [^ ]+ /dev/null' \ |xargs perl -pi -e 's,\b(compare) (\S+) (/dev/null),$1 $3 $2,' But manually convert this one: -compare out exp-$(echo $opt|tr ' ' _) +compare exp-$(echo $opt|tr ' ' _) out and avoid an inappropriate change to cfg.mk.
* tests: use more portable fd redirection in TESTS_ENVIRONMENTStefano Lattarini2011-10-121-2/+1
| | | | | | | | * tests/Makefile.am (TESTS_ENVIRONMENT): Redirection with `exec 9>&2' is not portable to various Korn shells, and to (at least) HP-UX 11 /bin/sh. Use a more portable idiom. See http://thread.gmane.org/gmane.comp.gnu.coreutils.bugs/22488 for lots of discussion.
* tests: make test runner a script, not a shell functionStefano Lattarini2011-10-115-16/+3
| | | | | | | | | | | | | | | | | | | | | | | All the test scripts in the diffutils testsuite are shell scripts, so the current definition of TESTS_ENVIRONMENT, which adaptively run tests using either perl or the shell depending on their kind, is an overkill. Moreover, this change is required in order for the testsuite to continue to work with the new testsuite harness that is planned to be introduced in Automake 1.12 (which, as of the writing date, is still under development and in late alpha state). See also related discussion on bug-coreutils: <http://debbugs.gnu.org/cgi/bugreport.cgi?bug=8887> * tests/Makefile.am (TESTS_ENVIRONMENT): Remove definition of the `shell_or_perl_' shell function, which is not required anymore. (LOG_COMPILER): New, define to `$(SHELL)'. * tests/binary: Make executable. * tests/colliding-file-names: Likewise. * tests/excess-slash: Likewise. * tests/no-newline-at-eof: Likewise.
* portability: use SET_BINARY rather than xfreopen (NULL, ...Claudio Bley2011-10-043-5/+6
| | | | | | | * src/diff.c: Include binary-io.h, not xfreopen.h. (main): Use SET_BINARY (...) rather than xfreopen (NULL, X, ...), because the latter doesn't work on MinGW and crashes using MSVC. * src/cmp.c (main): Likewise.
* build: update gnulib submodule to latestJim Meyering2011-10-041-0/+0
|
* post-release administriviaJim Meyering2011-09-023-2/+5
| | | | | | * NEWS: Add header line for next release. * .prev-version: Record previous version. * cfg.mk (old_NEWS_hash): Auto-update.
* version 3.2v3.2Jim Meyering2011-09-021-1/+1
| | | | * NEWS: Record release date.
* build: update bootstrap and tests/init.sh from gnulibJim Meyering2011-09-022-99/+212
| | | | | * bootstrap: Update from gnulib. * tests/init.sh: Likewise.
* build: update gnulib submodule to latestJim Meyering2011-09-021-0/+0
|
* doc: diffutils' texi-derived doc may now be in debian's "main" sectionJim Meyering2011-09-021-0/+6
| | | | * NEWS (Packaging): Mention the "no front/back-cover" change.
* maint: avoid new "make sytnax-check" failure.Jim Meyering2011-08-151-1/+1
| | | | | * src/diff.h (find_dir_file_pathname): Mark declaration with "extern" keyword, in order to placate the tight-scope syntax check.
* * src/io.c (find_and_hash_each_line): Refactor for brevity.Paul Eggert2011-08-141-158/+77
|
* diff, sdiff: new option --ignore-trailing-space (-Z)Roland McGrath2011-08-147-61/+171
| | | | | | | | | | | | | | Derived from Roland McGrath's patch (dated June 2004!) in: http://lists.gnu.org/archive/html/bug-gnu-utils/2004-07/msg00000.html * NEWS: * doc/diffutils.texi (White Space, Blank Lines) (sdiff Option Summary, diff Options, sdiff Options): Document -Z. * src/diff.h (IGNORE_TRAILING_SPACE) (IGNORE_TAB_EXPANSION_AND_TRAILING_SPACE): New constants, for -Z. * src/diff.c (shortopts, longopts, main, option_help_msgid): * src/sdiff.c (longopts, option_help_msgid, main): * src/io.c (find_and_hash_each_line): * src/util.c (lines_differ, analyze_hunk): Support -Z.
* * bootstrap.conf (gnulib_modules): Remove timegm.Paul Eggert2011-08-131-1/+0
| | | | | This fixes a problem noted by Andreas Schwab in: http://lists.gnu.org/archive/html/bug-diffutils/2011-08/msg00035.html
* diff: --ignore-file-name-case now applies at top level tooTim Waugh2011-08-135-2/+56
| | | | | | | | | | | Derived from Tim Waugh's patch in: http://lists.gnu.org/archive/html/bug-diffutils/2011-08/msg00034.html * NEWS, doc/diffutils.texi (diff Options): Document this. * src/diff.c (compare_files): Implement this, by using find_dir_file_pathname. * src/diff.h (find_dir_file_pathname): New decl. * src/dir.c: Include filenamecat.h. (find_dir_file_pathname): New function.
* * .gitignore: Add lib/unistr, lib/unused-parameter.h.Paul Eggert2011-08-131-0/+2
|
* post-release administriviaJim Meyering2011-08-103-2/+5
| | | | | | * NEWS: Add header line for next release. * .prev-version: Record previous version. * cfg.mk (old_NEWS_hash): Auto-update.
* version 3.1v3.1Jim Meyering2011-08-101-1/+1
| | | | * NEWS: Record release date.
* build: use largefile module and update to latest gnulibJim Meyering2011-08-103-1/+1
| | | | | | * configure.ac: Remove AC_SYS_LARGEFILE, subsumed by ... * bootstrap.conf (gnulib_modules): ...this. Use largefile module. * gnulib: Update to latest.
* doc: insert comma in --help line for --ignore-space-change (-b)Santiago Vila2011-08-081-1/+1
| | | | | * src/diff.c (option_help_msgid): Insert omitted comma between "-b" and "--ignore-space-change". (tiny change)
* doc: relax restriction on front-cover and back-cover textsJim Meyering2011-08-041-8/+3
| | | | | | | * doc/diffutils.texi (copying): Relax restriction on front-cover and back-cover texts (just as m4 did here: http://git.savannah.gnu.org/cgit/m4.git/commit?id=ee1e92ec). Reported by Santiago Vila. Fix suggested by Eric Blake.
* tests: update init.sh from gnulibJim Meyering2011-08-031-53/+122
| | | | * tests/init.sh: Update from gnulib.
* build: update gnulib submodule to latestJim Meyering2011-08-031-0/+0
|
* maint: remove inclusion of unused header, for "make syntax-check"Jim Meyering2011-07-032-2/+0
| | | | | * src/diff3.c: Don't include <inttostr.h>. Not used. * src/context.c: Likewise.
* build: don't require perl when building from a tarballJim Meyering2011-06-192-4/+17
| | | | | | | | | | | | | But do ensure -- in all other circumstances -- that the man/*.1 files are rebuilt whenever the version number changes. * configure.ac (SRC_VERSION_C): Define. * man/Makefile.am (dist_man1_MANS): Rename from $(man1_MANS), so that we distribute those pesky man/*.1 files. (EXTRA_DIST): Reflect name change. (MAINTAINERCLEANFILES): Define this, not DISTCLEANFILES, now that these generated files are distributed. ($(dist_man1_MANS)): Depend on $(SRC_VERSION_C), so we get the full dependency when not building from a tarball.
* doc: do not distribute generated man/*.1 man filesJim Meyering2011-06-132-10/+677
| | | | | | | | | | * man/help2man: New file. * man/Makefile.am: Use $(srcdir)/help2man. Convert $(dist_man1_MANS) to $(man1_MANS), to tell automake not to distribute the generated man/*.1 files. Now they're generated at build-from-tarball time. ($(man1_MANS)): Depend on version.c, so that man pages are regenerated whenever the version string changes.
* build: ccache works better without embedded version stringsJim Meyering2011-06-137-4/+28
| | | | | | | | | | | | | * src/Makefile.am: Generate version.c and version.h and put the new symbol in a tiny library to be used by each program. (LDADD): Add the new library. * src/cmp.c (main): Use Version, not PACKAGE_VERSION, so the .o file does not change with each commit-derived version increment. * src/diff.c (main): Likewise. * src/diff3.c (main): Likewise. * src/sdiff.c (main): Likewise. * src/system.h: Include "version.h". * .gitignore: Add version.[ch]
* doc: ensure each program has a man/*.x file: add "SEE ALSO" referencesJim Meyering2011-06-125-5/+11
| | | | | | | | | * man/cmp.x: New file. * man/diff3.x: New file. * man/sdiff.x: New file. * man/diff.x: Add xrefs to the other three programs, and to patch. * man/Makefile.am (EXTRA_DIST): List new files. (cmp.1, diff3.1, sdiff.1): Depend on each .x file.
* doc: rename diff.texi to diffutils.texiJim Meyering2011-06-126-18/+15
| | | | | | | | | | | | | | | | This makes the .texi basename the same as the package name, which is consistent with most other GNU packages. * doc/diffutils.texi: Rename from... * doc/diff.texi: ...removed. * doc/Makefile.am (info_TEXINFOS): Reflect name change. (diffutils_TEXINFOS): Likewise. * cfg.mk (gendocs_options_): Remove this customization. It is no longer needed, now that the .texi name matches that of the package. * man/Makefile.am ($(dist_man1_MANS)): Remove now-unnecessary sed filter. * README: Update references to diffutils.texi etc. here, too. * .gitignore: Update here, too. Suggested by Karl Berry.
* cmp, diff, diff3, sdiff: edit and align --help text.Karl Berry2011-06-084-103/+146
| | | | | | | | * cmp.c (option_help_msgid, usage), * diff.c (option_help_msgid, usage), * diff3.c (option_help_msgid, usage), * sdiff.c (option_help_msgid, usage): align descriptions in the --help output and slightly edit content.
* diff: don't use locales after local-specific sorting failsPaul Eggert2011-05-271-3/+1
| | | | | | | * src/dir.c (compare_names): Don't invoke strcasecmp if locale-specific sorting fails, because POSIX.1-2008 says strcasecmp has unspecified behavior outside the POSIX locale. See: http://lists.gnu.org/archive/html/bug-diffutils/2011-05/msg00008.html
* bootstrap: Avoid multithreading.Paul Eggert2011-05-271-2/+4
| | | | | | | | | * bootstrap.conf (gnulib_tool_option_extras): Add "--avoid=localename --avoid=lock", because we don't want to bring in the multithreading code that recent gnulib changes would otherwise bring in. (excluded_files): Remove m4/lock.m4; no longer needed, now that we use --avoid=lock.
* build: update gnulib submodule to latestPaul Eggert2011-05-271-0/+0
|
* maint: update README-hackingKarl Berry2011-05-231-22/+66
| | | | * README-hacking: Update a la coreutils for git, etc.
* maint: update gnulib to latest with accompanying tight-scope tweaksJim Meyering2011-05-232-1/+4
| | | | | | | | * cfg.mk: Include $(srcdir)/dist-check.mk using "-include", to accommodate the new sc_tight_scope rule. (_gl_TS_extern): Define, to tell gnulib's tight_scope rule that headers here mark externs with "XTERN". * gnulib: Update to latest.
* maint: use gnulib's new readme-release moduleJim Meyering2011-05-183-83/+4
| | | | | | | * bootstrap.conf (gnulib_modules): Add readme-release. (bootstrap_epilogue): Add the recommended perl one-liner. * README-release: Remove file; it is now generated from gnulib. * .gitignore: Add it.
* build: update gnulib submodule to latestJim Meyering2011-05-181-0/+0
|
* maint: prepare for the tight-scope checkJim Meyering2011-05-182-39/+45
| | | | | | | | | | * src/diff.h: Mark function declarations with "extern" in preparation for the tight-scope check. (ignore_white_space): Separate enum decl from declaration of this variable. * src/Makefile.am (diff_SOURCES): Move diff.h from here to ... (noinst_HEADERS): ...here. For convenience, since the tight-scope rule uses $(noinst_HEADERS).
* maint: don't use now-removed gnulib "exit" moduleJim Meyering2011-05-181-1/+0
| | | | | * bootstrap.conf (gnulib_modules): Remove "exit" module. It no longer exists.
* build: update gnulib submodule to latestJim Meyering2011-03-261-0/+0
|
View Lorry Controller Status