Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Explore gix APIs, experiment with gix-blame API #1453

Open
wants to merge 15 commits into
base: main
Choose a base branch
from
Open

Explore gix APIs, experiment with gix-blame API #1453

wants to merge 15 commits into from

Commits on Nov 3, 2024

  1. Add initial implementation and tests for gix-blame. 

    Note that it's still very early, and this is more of a proof-of-concept
with a couple of bits still missing without which its usefulness
and real-world applicability is limited.
    @cruessler
    cruessler committed Nov 3, 2024
    Configuration menu
    Copy the full SHA
    984fad3 View commit details
    Browse the repository at this point in the history

  2. Update meta-data to include gix-blame crate

    @Byron @cruessler
    Byron authored and cruessler committed Nov 3, 2024
    Configuration menu
    Copy the full SHA
    1f225d3 View commit details
    Browse the repository at this point in the history

  3. feat: Add blame plumbing crate to the top-level. 

    For now, it doesn't come with a simplified `gix` API though.
    @cruessler
    cruessler committed Nov 3, 2024
    Configuration menu
    Copy the full SHA
    bee2ec1 View commit details
    Browse the repository at this point in the history

  4. feat: add gix blame to the CLI 

    That way it's possible to see the `blame` result of any file in the
repository.

Co-authored-by: Sebastian Thiel <sebastian.thiel@icloud.com>
    @cruessler @Byron
    cruessler and Byron committed Nov 3, 2024
    Configuration menu
    Copy the full SHA
    ba5bc6f View commit details
    Browse the repository at this point in the history

  5. Pass blame to more than one parent

    @cruessler
    cruessler committed Nov 3, 2024
    Configuration menu
    Copy the full SHA
    6102c83 View commit details
    Browse the repository at this point in the history

  6. Add ignored test for resolved merge conflict

    @cruessler
    cruessler committed Nov 3, 2024
    Configuration menu
    Copy the full SHA
    e4c2e97 View commit details
    Browse the repository at this point in the history

  7. Replace expect by ?

    @cruessler
    cruessler committed Nov 3, 2024
    Configuration menu
    Copy the full SHA
    b0aea31 View commit details
    Browse the repository at this point in the history

  8. Correctly pass blame for some merge commits 

    - Merge commits where a file was added in one chain of ancestors
- Merge commits where a conflict was resolved
    @cruessler
    cruessler committed Nov 3, 2024
    Configuration menu
    Copy the full SHA
    a7cb234 View commit details
    Browse the repository at this point in the history

  9. Adapt to changes in gix-diff

    @cruessler
    cruessler committed Nov 3, 2024
    Configuration menu
    Copy the full SHA
    02083c0 View commit details
    Browse the repository at this point in the history

  10. Add failing test

    @cruessler
    cruessler committed Nov 3, 2024
    Configuration menu
    Copy the full SHA
    a6e9e32 View commit details
    Browse the repository at this point in the history

  11. Add shortcut when oid is identical to parent's

    @cruessler
    cruessler committed Nov 3, 2024
    Configuration menu
    Copy the full SHA
    89e54c7 View commit details
    Browse the repository at this point in the history

  12. Walk commits in topological order

    @cruessler
    cruessler committed Nov 3, 2024
    Configuration menu
    Copy the full SHA
    a7d9b0b View commit details
    Browse the repository at this point in the history

  13. Add shortcut when oid is identical to parent's

    @cruessler
    cruessler committed Nov 3, 2024
    Configuration menu
    Copy the full SHA
    f9bd9ec View commit details
    Browse the repository at this point in the history

  14. Update gix-blame dependencies

    @cruessler
    cruessler committed Nov 3, 2024
    Configuration menu
    Copy the full SHA
    79539f0 View commit details
    Browse the repository at this point in the history

  15. let gitoxide-core enable the blame feature in gix by default.

    @Byron
    Byron committed Nov 3, 2024
    Configuration menu
    Copy the full SHA
    0f1da23 View commit details
    Browse the repository at this point in the history