[PATCH v6 0/6] blame: add the ability to ignore commits
- Date: Wed, 10 Apr 2019 12:24:03 -0400
- From: Barret Rhoden <brho@xxxxxxxxxx>
- Subject: [PATCH v6 0/6] blame: add the ability to ignore commits
This patch set adds the ability to ignore a set of commits and their
changes when blaming. This can be used to ignore a commit deemed 'not
interesting,' such as reformatting.
The last patch in the series changes the heuristic by which ignored
lines are attributed to specific lines in the parent commit. This
increases the likelihood of blaming the 'right' commit, where 'right' is
subjective. Perhaps we want another algorithm. I'm using a relatively
simple one that uses the basics of Michael's fingerprinting code, but he
has another algorithm.
v5 -> v6
- The "guess" heuristic can now look anywhere in the parent file for a
matching line, instead of just looking in the parent chunk. The
chunks passed to blame_chunk() are smaller than you'd expect: they are
just adjacent '-' and '+' sections. Any diff 'context' is a chunk
- Fixed the parent_len calculation. I had been basing it off of
e->num_lines, and treating the blame entry as if it was the target
chunk, but the individual blame entries are subsets of the chunk. I
just pass the parent chunk info all the way through now.
- Use Michael's newest fingerprinting code, which is a large speedup.
- Made a config option to zero the hash for an ignored line when the
heuristic could not find a line in the parent to blame. Previously,
this was always 'on'.
- Moved the for loop variable declarations out of the for ().
- Rebased on master.
v4 -> v5
- Changed the handling of blame_entries from ignored commits so that you
can use any algorithm you want to map lines from the diff chunk to
different parts of the parent commit.
- fill_origin_blob() optionally can track the offsets of the start of
every line, similar to what we do in the scoreboard for the final
file. This can be used by the matching algorithm. It has no effect
if you are not ignoring commits.
- RFC of a fuzzy/fingerprinting heuristic, based on Michael Platings RFC
- Made the tests that detect unblamable entries more resilient to
- Fixed a few bugs:
- tests were not grepping the line number from --line-porcelain
- In the old version, when I passed the "upper" part of the
blame entry to the target and marked unblamable, the suspect
was incorrectly marked as the parent. The s_lno was also in
the parent's address space.
v3 -> v4
- Cleaned up the tests, especially removing usage of sed -i.
- Squashed the 'tests' commit into the other blame commits. Let me know
if you'd like further squashing.
v2 -> v3
- SHA-1 -> "object name", and fixed other comments
- Changed error string for oidset_parse_file()
- Adjusted existing fsck tests to handle those string changes
- Return hash of all zeros for lines we know we cannot identify
- Allow repeated options for blame.ignoreRevsFile and
--ignore-revs-file. An empty file name resets the list. Config
options are parsed before the command line options.
- Rebased to master
- Added regression tests
v1 -> v2
- extracted the skiplist from fsck to avoid duplicating code
- overhauled the interface and options
- split out markIgnoredFiles
- handled merges
Barret Rhoden (6):
Move init_skiplist() outside of fsck
blame: use a helper function in blame_chunk()
blame: add the ability to ignore commits and their changes
blame: add config options to handle output for ignored lines
blame: optionally track line fingerprints during fill_blame_origin()
blame: use a fingerprint heuristic to match ignored lines
Documentation/blame-options.txt | 18 ++
Documentation/config/blame.txt | 16 ++
Documentation/git-blame.txt | 1 +
blame.c | 446 ++++++++++++++++++++++++++++----
blame.h | 6 +
builtin/blame.c | 56 ++++
fsck.c | 37 +--
oidset.c | 35 +++
oidset.h | 8 +
t/t5504-fetch-receive-strict.sh | 14 +-
t/t8013-blame-ignore-revs.sh | 202 +++++++++++++++
11 files changed, 740 insertions(+), 99 deletions(-)
create mode 100755 t/t8013-blame-ignore-revs.sh