git/diff-helper.c, branch v0.99

[PATCH] Update diff documentation.

2005-06-20T03:13:18Z

This updates diff documentation to discuss --find-copies-harder, and adds descriptions for options that were not described earlier. Signed-off-by: Junio C Hamano Signed-off-by: Linus Torvalds

[PATCH] Add --diff-filter= output restriction to diff-* family.

2005-06-13T03:40:20Z

This is a halfway between debugging aid and a helper to write an ultra-smart merge scripts. The new option takes a string that consists of a list of "status" letters, and limits the diff output to only those classes of changes, with two exceptions: - A broken pair (aka "complete rewrite"), does not match D (deleted) or N (created). Use B to look for them. - The letter "A" in the diff-filter string does not match anything itself, but causes the entire diff that contains selected patches to be output (this behaviour is similar to that of --pickaxe-all for the -S option). For example, $ git-rev-list HEAD | git-diff-tree --stdin -s -v -B -C --diff-filter=BCR shows a list of commits that have complete rewrite, copy, or rename. Signed-off-by: Junio C Hamano Signed-off-by: Linus Torvalds

[PATCH] diff: Fix docs and add -O to diff-helper.

2005-06-03T18:23:03Z

This patch updates diff documentation and usage strings: - clarify the semantics of -R. It is not "output in reverse"; rather, it is "I will feed diff backwards". Semantically they are different when -C is involved. - describe -O in usage strings of diff-* brothers. It was implemented, documented but not described in usage text. Also it adds -O to diff-helper. Like -S (and unlike -M/-C/-B), this option can work on sanitized diff-raw output produced by the diff-* brothers. While we are at it, the call it makes to diffcore is cleaned up to use the diffcore_std() like everybody else, and the declaration for the low level diffcore routines are moved from diff.h (public) to diffcore.h (private between diff.c and diffcore backends). Signed-off-by: Junio C Hamano Signed-off-by: Linus Torvalds

[PATCH] diff-helper: Fix R/C score parsing under -z flag.

2005-05-30T17:35:49Z

The score number that follow R/C status were parsed but the parse pointer was not updated, causing the entire line to become unrecognized. This patch fixes this problem. There was a test missing to catch this breakage, which this commit adds as t4009-diff-rename-4.sh. The diff-raw tests used in related t4005-diff-rename-2.sh (the same test without -z) and t4007-rename-3.sh were stricter than necessarily, despite that the comment for the tests said otherwise. This patch also corrects them. The documentation is updated to say that the status can optionally be followed by a number called "score"; it does not have to stay similarity index forever and there is no reason to limit it only to C and R. Signed-off-by: Junio C Hamano Signed-off-by: Linus Torvalds

[PATCH] Adjust diff-helper to diff-tree -v -z changes.

2005-05-29T18:40:40Z

The latest change to diff-tree -z output adds an extra line termination after non diff-raw material (the header and the commit message). To compensate for this change, stop adding the output termination of our own. "diff-tree -v -z" piped to "diff-helper -z" would give different result from "diff-tree -v" piped to "diff-helper" without this change. Signed-off-by: Junio C Hamano Signed-off-by: Linus Torvalds

[PATCH] Move pathspec to the beginning of the diffcore chain.

2005-05-29T18:17:43Z

This changes the way how pathspec is used in the three diff-* brothers. Earlier, they tried to grab as much information from the original input and used pathspec to limit the output. This version uses pathspec upfront to narrow the world diffcore operates in, so "git-diff-* some-directory" does not look at things outside the specified subtree when finding rename/copy or running pickaxe. Since diff-tree already takes this view and does not feed anything outside the specified directotires to begin with, this patch does not have to touch that command. Signed-off-by: Junio C Hamano Signed-off-by: Linus Torvalds

[PATCH] Add --pickaxe-all to diff-* brothers.

2005-05-29T18:17:43Z

When --pickaxe-all is given in addition to -S, pickaxe shows the entire diffs contained in the changeset, not just the diffs for the filepair that touched the sought-after string. This is useful to see the changes in context. Signed-off-by: Junio C Hamano Signed-off-by: Linus Torvalds

[PATCH] Do not expose internal scaling to diff-helper.

2005-05-29T18:17:43Z

Instead we can normalize what diff-raw records at the diffcore side. Signed-off-by: Junio C Hamano Signed-off-by: Linus Torvalds

[PATCH] Mode only changes from diff.

2005-05-25T23:06:24Z

This fixes another bug. - Mode-only changes were pruned incorrectly from the output. - Added test to catch the above problem. - Normalize rename/copy similarity score in the diff-raw output to per-cent, no matter what scale we internally use. Signed-off-by: Junio C Hamano Signed-off-by: Linus Torvalds

[PATCH] diff-raw format update take #2.

2005-05-23T23:23:10Z

This changes the diff-raw format again, following the mailing list discussion. The new format explicitly expresses which one is a rename and which one is a copy. The documentation and tests are updated to match this change. Signed-off-by: Junio C Hamano Signed-off-by: Linus Torvalds