Add :linear filter #741
Add :linear filter #741
Conversation
christian-schilling
changed the title
christian-schilling
force-pushed
the
@changes/master/christian.schilling.de@gmail.com/linear-filter
branch
from
d3e88fc to
0000bda
Compare
| ### Linearize history **:linear** | ||
| Produce a filtered history that does not contain any merge commits. This is done by | ||
| simply dropping all parents except the first on every commit. | ||
|
|
There was a problem hiding this comment.
maybe a few words on a typical use case?
Change-Id: linear-filter
christian-schilling
force-pushed
the
@changes/master/christian.schilling.de@gmail.com/linear-filter
branch
from
0000bda to
cdc44e3
Compare
LMG
left a comment
LMG
left a comment
There was a problem hiding this comment.
It looks good to me, just a few questions to understand the implementation
| Squash, | ||
| Paths, | ||
| Squash, | ||
| Linear, |
| } | ||
| let parent = some_or!(apply_to_commit2(op, &p[0], transaction)?, { | ||
| return Ok(None); | ||
| }); |
There was a problem hiding this comment.
Returning Ok(None) from this function means that we cannot produce filtered commit right now because one of the parents was not filtered yet. In order to not recuruse here to filter the parent we return and will get called again at a later point when the parent has been filtered.
| ) -> JoshResult<git2::Tree<'a>> { | ||
| return match op { | ||
| Op::Nop => Ok(tree), | ||
| Op::Linear => Ok(tree), |
There was a problem hiding this comment.
I can see that it works, but I don't understand why. How does it find the parents after this?
There was a problem hiding this comment.
Magic 🪄
Just like with any other filter: When we need to find the original commits we search them by traversing the commit graph until we find apply(sha) == filtered_sha.
Many filters drop commits, how exactly does not matter for the algorithm to work.
There was a problem hiding this comment.
That makes sense. Thinking about it more, this didn't confuse me on other filters, but for some reason I got stuck on this one :)
christian-schilling
deleted the
@changes/master/christian.schilling.de@gmail.com/linear-filter
branch
No description provided.