2001-04-22  Tim Waugh  <twaugh@redhat.com>

	* interdiff.c (VERSION): Version 0.1.0 (devel).

2001-04-22  Tim Waugh  <twaugh@redhat.com>

	* interdiff.c (max_context, max_context_real,
	ignore_components, pat_drop_context): New globals.
	(human_readable): Default to on.
	(check_filename): New function.
	(output_delta): Generate specified amount of context.
	(copy_residue): Check file name for context settings.
	(interdiff): Likewise.
	(xopen): Return immediately if opening the file failed.
	(main): Getoptify.

	* util.c: New file.
	(xstrdup): Implement in terms of xmalloc and strcpy.
	(patlist_add, patlist_match, patlist_free): New.
	* util.h: New file.  Declare above functions.
	(xmalloc, xstrndup): Move...
	* interdiff.c: ...from here.

2001-02-23  Tim Waugh  <twaugh@redhat.com>

	* interdiff.c (calculate_num_lines): More careful string
	handling.

2001-02-23  Tim Waugh  <twaugh@redhat.com>

	* interdiff.c (VERSION): Version 0.0.10 (stable).

2001-02-23  Tim Waugh  <twaugh@redhat.com>

	* tests/comma/run-test: New test.
	* Makefile: Run test.
	* interdiff.c (calculate_num_lines): Calculate the number of
	lines in the original for "@@ -1 +x,y @@" correctly as 1, not y.
	Fixes comma test.

2000-11-05  Tim Waugh  <twaugh@redhat.com>

	* interdiff.c (xopen): Handle non-existent files.

2000-11-04  Tim Waugh  <twaugh@redhat.com>

	* interdiff.c (VERSION): Version 0.0.9 (stable).

2000-11-04  Tim Waugh  <twaugh@redhat.com>

	* interdiff.c (xopen): New function.  Get a seekable FILE stream
	from a possible non-seekable FILE stream.
	(main): Use it, because we need to seek.

2000-08-16  Tim Waugh  <twaugh@redhat.com>

	* interdiff.c (best_name): Shut gcc up (best is always
	initialised).

	* Makefile (DEBIAN_DEBUGFLAGS): Debian policy changes (Adrian
	Bunk).

2000-08-07  Tim Waugh  <twaugh@redhat.com>

	* interdiff.c (VERSION): Version 0.0.8 (stable).

2000-08-03  Tim Waugh  <twaugh@redhat.com>

	* interdiff.c (stripped): Ignore "./" at the beginning of names,
	for the purpose of comparison.

2000-08-03  Boszormenyi Zoltan  <zboszor@externet.hu>

	* interdiff.c (main): Several fixes in parameter parsing.

2000-08-02  Tim Waugh  <twaugh@redhat.com>

	* Makefile: Fix command substitution.

2000-08-02  Tim Waugh  <twaugh@redhat.com>

	* interdiff.c (VERSION): Version 0.0.7 (stable).

2000-08-02  Tim Waugh  <twaugh@redhat.com>

	* interdiff.c (file_in_list): Ignore pathname components when told
	to.

2000-08-01  Tim Waugh  <twaugh@redhat.com>

	* interdiff.c (create_orig): Take note of @@ lines properly.
	(stripped): New function.

	* interdiff.1: Updated for -p.

	* interdiff.c (create_orig): Don't keep freeing memory that will
	be immediately reallocated.
	(interdiff): Likewise.
	(output_reverted): Likewise.
	(switch_order_preference): New function.
	(main): Tidy up option parsing (but we'll use getopt someday).
	(syntax): Update syntax.

	* tests/newline3/run-test: New test.

	* tests/copy1/run-test: New test.

	* tests/newline2/run-test: New test.

	* tests/apply1/run-test: New test.

	* tests/revert2/run-test: New test.

	* Makefile (TESTS): Add revert2, apply1, copy1, newline2 and
	newline3 to regression tests.

	* interdiff.c (output_reverted): Handle patches for files with no
	newline in the last line.  Now newline3 passes.

	* interdiff.c (copy_residue): Fix @@ handling.  Now copy1 passes.

	* interdiff.c (apply_patch): Fix @@ handling.  Now apply1 passes.

	* interdiff.c (output_reverted): Take note of @@ lines (properly).
	(calculate_num_lines): New function to calculate the number of
	context lines expected from either the original file or the
	modified file.
	(orig_num_lines): New function.
	(new_num_lines): New function.
	(interdiff): Use xstrdup not strdup.


2000-08-01  Tim Waugh  <twaugh@redhat.com>

	* interdiff.c (VERSION): Version 0.0.6 (stable).

2000-08-01  Tim Waugh  <twaugh@redhat.com>

	* Makefile (TESTS): Add dashes4 to regression tests.

	* tests/dashes4/run-test: New test.

2000-07-31  Tim Waugh  <twaugh@redhat.com>

	* tests/dashes2/run-test: Some fixes.

	* tests/dashes1/run-test: Some fixes.

	* Makefile (TESTS): Add dashes, dashes1, dashes2 and dashes3 to
	regression tests.

	* tests/dashes3/run-test: New test.

	* interdiff.c (interdiff): Don't fclose anything in this function
	since it is done in main.
	(index_patch2): Take note of @@ lines.
	(apply_patch): Likewise.
	(copy_residue): Don't free line every time round the loop.
	(copy_residue): Take note of @@ lines.

	* Makefile (TESTS): Add revert1 and gendiff2 to regression tests.

	* tests/revert1/run-test: New test.

	* tests/gendiff2/run-test: New test.

	* interdiff.c (index_patch2): Use best_name.
	(output_reverted): How did this ever work?!  Be paranoid about @@
	lines, and skip over the space in between the line numbers.

2000-07-31  Tim Waugh  <twaugh@redhat.com>

	* interdiff.c (VERSION): Version 0.0.5 (stable).

2000-07-31  Tim Waugh  <twaugh@redhat.com>

	* interdiff.c (output_delta): Use -U0 instead of the (deprecated)
	-0 option.

2000-07-31  Jason Bucata  <jbucata@earthlink.net>

	* interdiff.c (xstrdup): New function.
	(add_to_list): Use it.
	(add_line): Likewise.
	(output_reverted): Likewise.
	(interdiff): Likewise.
	(xstrndup): New function.
	(output_reverted): Use it.
	(interdiff): Likewise.


2000-07-31  Tim Waugh  <twaugh@redhat.com>

	* Makefile (TESTS): Add gendiff1 to regression tests.

	* interdiff.c (output_reverted): Read the oldname line from p1
	rather than by parameter.
	(num_pathname_components): New function.
	(best_name): New function.
	(interdiff): Work out the best name to use.  Doesn't use Index:
	lines yet.

	* tests/gendiff1/run-test: New test.

2000-07-26  Tim Waugh  <twaugh@redhat.com>

	* interdiff.c (VERSION): Version 0.0.4 (stable).

2000-07-26  Tim Waugh  <twaugh@redhat.com>

	* interdiff.1: Updated date.

	* interdiff.spec: Created.

2000-07-25  Tim Waugh  <twaugh@redhat.com>

	* tests/linux-2.2.17-pre4-5/run-test: New test case.  Needs to be
	distilled.

	* interdiff.c (output_reverted): Only display patch separator if
	-h is specified.
	(output_delta): Likewise.
	(copy_residue): Likewise.

2000-07-24  Tim Waugh  <twaugh@redhat.com>

	(munge_diff_output): Avoid compile warning.
	(create_orig): Deal with broken patches (fixes
	tests/broken1.tar).

2000-07-24  Tim Waugh  <twaugh@redhat.com>

	* interdiff.c (VERSION): Version 0.0.3 (stable).

	* Makefile (sure): Regression tests.

	* interdiff.c (munge_diff_output): New function.
	(output_delta): Find out if either patch removes the file.  If
	not, call munge_diff_output to fix up the diff output.

2000-07-21  Tim Waugh  <twaugh@redhat.com>

	* interdiff.c (output_delta): Use mkstemp to create temporary
	files.
	(apply_patch): Use PATCH.
	(output_delta): Use DIFF.
	(output_delta): Likewise.
	(DIFF): Define if not already defined.
	(PATCH): Likewise.
	(VERSION): Version 0.0.2 (stable).

2000-07-19  Tim Waugh  <twaugh@redhat.com>

	* interdiff.c (output_delta): Remove redundant comment.

	(interdiff): Prevent false alarms.

2000-07-19  Tim Waugh  <twaugh@redhat.com>

	* interdiff.c (copy_residue): Put patch delimiter in.
	(output_delta): Patch delimiter reflects options actually given to
	diff.
	(main): -h option turns on human-readability.
	(VERSION): Version 0.0.1 (stable).

