diff options
author | Jim Meyering <meyering@fb.com> | 2017-01-31 10:45:11 -0800 |
---|---|---|
committer | Jim Meyering <meyering@fb.com> | 2017-01-31 10:45:20 -0800 |
commit | 75173432ed47ae77d3024da8e5daa70f1f8d2650 (patch) | |
tree | 55f76177849f293782316d9e6b42ac2c73dfecc3 | |
parent | 90106d33ab3004872f8cfe46779683be48b7bd12 (diff) | |
download | diffutils-75173432ed47ae77d3024da8e5daa70f1f8d2650.tar.gz |
maint: change "time stamp" to "timestamp" globally
This avoids a new syntax-check failure.
* ChangeLog-2008: Perform that change.
* doc/diffutils.texi: Likewise.
* NEWS: Likewise.
* cfg.mk: Update the old news hash accordingly.
-rw-r--r-- | ChangeLog-2008 | 8 | ||||
-rw-r--r-- | NEWS | 4 | ||||
-rw-r--r-- | cfg.mk | 2 | ||||
-rw-r--r-- | doc/diffutils.texi | 76 |
4 files changed, 45 insertions, 45 deletions
diff --git a/ChangeLog-2008 b/ChangeLog-2008 index bde317d..714c354 100644 --- a/ChangeLog-2008 +++ b/ChangeLog-2008 @@ -1068,7 +1068,7 @@ (Standards conformance): New chapter. (Binary): Differing binary files are trouble unless the user asked for brief output. - (Detailed Context): Prefer ISO time stamp format in discussion. + (Detailed Context): Prefer ISO timestamp format in discussion. (Detailed Unified, Pagination): Likewise. (Less Context): Likewise. Also use short option. (Alternate Names): Separate option from arg. @@ -1189,7 +1189,7 @@ likewise for -u and -U 3. Use specify_style and specify_value. (SIGCHLD): Do not define; now done in a header. - Use new style time stamp format for -u / -U. + Use new style timestamp format for -u / -U. Reject numeric-string options if operating in POSIX 1003.1-2001 mode. Avoid overflow problems with tab width. Simplify from-file and to-file code. @@ -1956,7 +1956,7 @@ (TIMESPEC_NS): New macro. (nstrftime): New decl. (print_context_label): Use nstrftime and time_format to format times. - Print numeric time stamp value if localtime fails. + Print numeric timestamp value if localtime fails. (print_context_function): New function. (pr_context_hunk, pr_unidiff_hunk): Use it. (find_function): Use size_t for sizes, not int. @@ -2538,7 +2538,7 @@ Thu Sep 22 16:47:00 1994 Paul Eggert <eggert@twinsun.com> (binprefix): Removed. (distfiles): Add stamp-h.in. (clean): Clean stamp-h. - (config.hin, config.h): Use time stamp files. + (config.hin, config.h): Use timestamp files. (cmp_o): Add $(LIBOBJS). (install): Install info files from srcdir if they're not in `.'. @@ -178,7 +178,7 @@ User-visible changes in version 2.8.6: cmp now uses the maximal value instead of the last one. * diff now omits the ".000000000" on hosts that do not support - fractional time stamps. + fractional timestamps. Version 2.8.5 was not publicly released. @@ -223,7 +223,7 @@ User-visible changes in version 2.8: * cmp now outputs "byte" rather than "char" outside the POSIX locale. * cmp -l's index column width now adjusts to fit larger (or smaller) files. * cmp -l -s and cmp -s -l are not allowed. Use cmp -s or cmp -l instead. -* diff uses ISO 8601 style time stamps for output times (e.g. "2001-11-23 +* diff uses ISO 8601 style timestamps for output times (e.g. "2001-11-23 16:44:36.875702460 -0800") unless in the C or POSIX locale and the -c style is specified. * diff's -I and -F options use the regexp syntax of grep, not of Emacs. @@ -33,7 +33,7 @@ bootstrap-tools = autoconf,automake,gnulib # Now that we have better tests, make this the default. export VERBOSE = yes -old_NEWS_hash = 7813d6f6ccefe3a1706548b5f1cab93f +old_NEWS_hash = 0216ec3bf3e3322f33afd4e949a9a29b # Tell maint.mk's syntax-check rules that diff gets config.h directly or # via diff.h or system.h. diff --git a/doc/diffutils.texi b/doc/diffutils.texi index 54a1457..16da09e 100644 --- a/doc/diffutils.texi +++ b/doc/diffutils.texi @@ -700,13 +700,13 @@ like this: @noindent @vindex LC_TIME -@cindex time stamp format, context diffs -The time stamp normally looks like @samp{2002-02-21 23:30:39.942229878 +@cindex timestamp format, context diffs +The timestamp normally looks like @samp{2002-02-21 23:30:39.942229878 -0800} to indicate the date, time with fractional seconds, and time zone in @uref{ftp://ftp.isi.edu/in-notes/rfc2822.txt, Internet RFC 2822 format}. (The fractional seconds are omitted on hosts that do -not support fractional time stamps.) However, a traditional time -stamp like @samp{Thu Feb 21 23:30:39 2002} is used if the +not support fractional timestamps.) However, a traditional timestamp +like @samp{Thu Feb 21 23:30:39 2002} is used if the @env{LC_TIME} locale category is either @samp{C} or @samp{POSIX}. You can change the header's content with the @@ -816,11 +816,11 @@ like this: @end example @noindent -@cindex time stamp format, unified diffs -The time stamp looks like @samp{2002-02-21 23:30:39.942229878 -0800} +@cindex timestamp format, unified diffs +The timestamp looks like @samp{2002-02-21 23:30:39.942229878 -0800} to indicate the date, time with fractional seconds, and time zone. The fractional seconds are omitted on hosts that do not support -fractional time stamps. +fractional timestamps. You can change the header's content with the @option{--label=@var{label}} option. @xref{Alternate Names}. @@ -2570,7 +2570,7 @@ hunks (if any) into @samp{@var{f}.rej}. * Revision Control:: Getting files from @acronym{RCS}, @acronym{SCCS}, etc. * Imperfect:: Dealing with imperfect patches. * Creating and Removing:: Creating and removing files with a patch. -* Patching Time Stamps:: Updating time stamps on patched files. +* Patching Timestamps:: Updating timestamps on patched files. * Multiple Patches:: Handling multiple patches in a file. * patch Directories:: Changing directory and stripping directories. * Backups:: Whether backup files are made. @@ -2816,12 +2816,12 @@ file. If the patch appears to create a file that already exists, @command{patch} asks for confirmation before applying the patch. -@node Patching Time Stamps -@section Updating Time Stamps on Patched Files -@cindex time stamps on patched files +@node Patching Timestamps +@section Updating Timestamps on Patched Files +@cindex timestamps on patched files When @command{patch} updates a file, it normally sets the file's -last-modified time stamp to the current time of day. If you are using +last-modified timestamp to the current time of day. If you are using @command{patch} to track a software distribution, this can cause @command{make} to incorrectly conclude that a patched file is out of date. For example, if @file{syntax.c} depends on @file{syntax.y}, and @@ -2830,29 +2830,29 @@ date. For example, if @file{syntax.c} depends on @file{syntax.y}, and @file{syntax.y} even though its contents are actually up to date. The @option{--set-utc} (@option{-Z}) option causes @command{patch} to -set a patched file's modification and access times to the time stamps +set a patched file's modification and access times to the timestamps given in context diff headers. If the context diff headers do not specify a time zone, they are assumed to use Coordinated Universal Time (@acronym{UTC}, often known as @acronym{GMT}). The @option{--set-time} (@option{-T}) option acts like @option{-Z} or @option{--set-utc}, except that it assumes that the context diff -headers' time stamps use local time instead of @acronym{UTC}. This option +headers' timestamps use local time instead of @acronym{UTC}. This option is not recommended, because patches using local time cannot easily be -used by people in other time zones, and because local time stamps are +used by people in other time zones, and because local timestamps are ambiguous when local clocks move backwards during daylight-saving time adjustments. If the context diff headers specify a time zone, this option is equivalent to @option{--set-utc} (@option{-Z}). -@command{patch} normally refrains from setting a file's time stamps if -the file's original last-modified time stamp does not match the time +@command{patch} normally refrains from setting a file's timestamps if +the file's original last-modified timestamp does not match the time given in the diff header, of if the file's contents do not exactly match the patch. However, if the @option{--force} (@option{-f}) -option is given, the file's time stamps are set regardless. +option is given, the file's timestamps are set regardless. Due to the limitations of the current @command{diff} format, @command{patch} cannot update the times of files whose contents have -not changed. Also, if you set file time stamps to values other than +not changed. Also, if you set file timestamps to values other than the current time of day, you should also remove (e.g., with @samp{make clean}) all files that depend on the patched files, so that later invocations of @command{make} do not get confused by the patched @@ -3356,7 +3356,7 @@ To generate the patch, use the command @samp{diff -Naur @var{old} directories. The names @var{old} and @var{new} should not contain any slashes. The @option{-N} option lets the patch create and remove files; @option{-a} lets the patch update non-text files; @option{-u} -generates useful time stamps and enough context; and @option{-r} lets +generates useful timestamps and enough context; and @option{-r} lets the patch update subdirectories. Here is an example command, using Bourne shell syntax: @@ -3465,8 +3465,8 @@ exclude them from the patch by giving @command{diff} the @option{-x @var{pattern}} option (@pxref{Comparing Directories}). If you want your patch to modify a derived file because your recipients lack tools to build it, make sure that the patch for the derived file follows any -patches for files that it depends on, so that the recipients' time -stamps will not confuse @command{make}. +patches for files that it depends on, so that the recipients' +timestamps will not confuse @command{make}. Now you can create the patch using @samp{diff -Naur}. Make sure to specify the scratch directory first and the newer directory second. @@ -4343,9 +4343,9 @@ Do not ask any questions. @xref{patch Messages}. @item -T @itemx --set-time -Set the modification and access times of patched files from time -stamps given in context diff headers, assuming that the context diff -headers use local time. @xref{Patching Time Stamps}. +Set the modification and access times of patched files from timestamps +given in context diff headers, assuming that the context diff +headers use local time. @xref{Patching Timestamps}. @item -u @itemx --unified @@ -4378,9 +4378,9 @@ Use @var{suffix} as the backup extension instead of @samp{.orig} or @item -Z @itemx --set-utc -Set the modification and access times of patched files from time -stamps given in context diff headers, assuming that the context diff -headers use @acronym{UTC}. @xref{Patching Time Stamps}. +Set the modification and access times of patched files from timestamps +given in context diff headers, assuming that the context diff +headers use @acronym{UTC}. @xref{Patching Timestamps}. @end table @@ -4597,7 +4597,7 @@ following suggested projects. * Changing Structure:: Handling changes to the directory structure. * Special Files:: Handling symbolic links, device special files, etc. * Unusual File Names:: Handling file names that contain unusual characters. -* Time Stamp Order:: Outputting diffs in time stamp order. +* Timestamp Order:: Outputting diffs in timestamp order. * Ignoring Changes:: Ignoring certain changes while showing others. * Speedups:: Improving performance. @end menu @@ -4642,7 +4642,7 @@ There should be a way to specify that a file has been removed without having to include its entire contents in the patch file. There should also be a way to tell @command{patch} that a file was renamed, even if there is no way for @command{diff} to generate such information. -There should be a way to tell @command{patch} that a file's time stamp +There should be a way to tell @command{patch} that a file's timestamp has changed, even if its contents have not changed. These problems can be fixed by extending the @command{diff} output format @@ -4683,16 +4683,16 @@ parse. The problem is with format of @command{diff} output, not just with patches the wrong files. The format of @command{diff} output should be extended to handle all possible file names. -@node Time Stamp Order -@subsection Outputting Diffs in Time Stamp Order +@node Timestamp Order +@subsection Outputting Diffs in Timestamp Order Applying @command{patch} to a multiple-file diff can result in files -whose time stamps are out of order. @acronym{GNU} @command{patch} has -options to restore the time stamps of the updated files -(@pxref{Patching Time Stamps}), but sometimes it is useful to generate +whose timestamps are out of order. @acronym{GNU} @command{patch} has +options to restore the timestamps of the updated files +(@pxref{Patching Timestamps}), but sometimes it is useful to generate a patch that works even if the recipient does not have @acronym{GNU} patch, or does not use these options. One way to do this would be to -implement a @command{diff} option to output diffs in time stamp order. +implement a @command{diff} option to output diffs in timestamp order. @node Ignoring Changes @subsection Ignoring Certain Changes @@ -4719,10 +4719,10 @@ However, this outputs the filtered text, not the original. @subsection Improving Performance When comparing two large directory structures, one of which was -originally copied from the other with time stamps preserved (e.g., +originally copied from the other with timestamps preserved (e.g., with @samp{cp -pR}), it would greatly improve performance if an option told @command{diff} to assume that two files with the same size and -time stamps have the same content. @xref{diff Performance}. +timestamps have the same content. @xref{diff Performance}. @node Bugs @section Reporting Bugs |