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.

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

Add gix diff tree #1626

Merged
merged 2 commits into from
Oct 15, 2024
Merged

Add gix diff tree #1626

merged 2 commits into from
Oct 15, 2024

Conversation

cruessler
Copy link
Contributor

This PR adds a very basic gix diff tree subcommand. The output is very low level because it is supposed to help in debugging gix blame. Let me know if this is going in the right direction in which case I will replace the few TODO comments by proper ones.

Copy link
Member

@Byron Byron left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for getting this started!

Please feel free to use any output style that you find useful, gix is a developer tool and thus is there to be useful to you, not to replicate git.

Once the basic documentation of the CLI is done, merging this PR won't take long.

gitoxide-core/src/repository/diff.rs Outdated Show resolved Hide resolved
gitoxide-core/src/repository/diff.rs Show resolved Hide resolved
@cruessler
Copy link
Contributor Author

Perfect! I made a few minor changes, so from my side it’s good to go. I hope I’ve picked up the right patterns with respect to documentation, wording and style, let me know if I haven’t!

Copy link
Member

@Byron Byron left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, this looks great!

I altered the output a bit to be more compact, which should be easier to parse for humans:

M: gitoxide-core
  07d9a8eaca88ef0ed1fc1b62867a699519f72918 -> 4e07fa7a1ee0fee4a02674ea983f38a2432c029e
  40000 -> 40000
M: src
  d4694a7c701e721067dc93fde402dea6e93c2202 -> 34a16f1a9422e3aee256d07fba533615b2f11b98
  40000 -> 40000
M: gitoxide-core/src
  9d54cff8220f8954cf751dc0645eff626b36c1ff -> ff3058350b64f4557659a3342dd92d3b5c5b9314
  40000 -> 40000
M: src/plumbing
  5fd37efa8f8b130ddb882a880442a4807c0e16b3 -> 9dabb47090b0036f55fa84c8a34cf176178b186f
  40000 -> 40000
M: gitoxide-core/src/repository
  33a974f21369bdc7b75eb6b2c83de3b18e252a80 -> 0e017b40f7398de02dc0e7446cd13c49718b755b
  40000 -> 40000
M: src/plumbing/options
  87f1da1a38158669b566fd8c4da9899f85e1dd93 -> 670c2694f21797f29ce29d435a1e0c9a3398e201
  40000 -> 40000
M: gitoxide-core/src/repository/diff.rs
  f6b515682076d1dcd87772536b3b5f560a57a9bd -> 18ca60f9e88f2694651f6202c49882520d76d468
  100644 -> 100644
M: src/plumbing/options/mod.rs
  b038d3ca0916e5c0c7a784f37edbbc3481a131b7 -> b6b1b005f110e92403cd5a74f0b9e552f662596d
  100644 -> 100644

…is now…

M: gitoxide-core/
  07d9a8eac -> 4e07fa7a1
M: src/
  d4694a7c7 -> 34a16f1a9
M: gitoxide-core/src/
  9d54cff82 -> ff3058350
M: src/plumbing/
  5fd37efa8 -> 9dabb4709
M: gitoxide-core/src/repository/
  33a974f21 -> 0e017b40f
M: src/plumbing/options/
  87f1da1a3 -> 670c2694f
M: gitoxide-core/src/repository/diff.rs
  f6b515682 -> 18ca60f9e
M: src/plumbing/options/mod.rs
  b038d3ca0 -> b6b1b005f

It's possible that you wanted it like it was for other reasons, and if the case I think you could add another PR with an option that reverts it to the previous rendering style. Or maybe, just revert it to what you need and it can stay like this until gix blame is fully functional.

cruessler and others added 2 commits October 15, 2024 11:27
It's primarily meant to better understand `gix blame`.
@Byron Byron force-pushed the add-gix-diff branch 2 times, most recently from 106d477 to 6777ecb Compare October 15, 2024 09:28
@Byron Byron enabled auto-merge October 15, 2024 09:39
@Byron
Copy link
Member

Byron commented Oct 15, 2024

And…I actually found something I will investigate :D. Great tool already!

@Byron Byron merged commit f186c23 into GitoxideLabs:main Oct 15, 2024
16 checks passed
@cruessler
Copy link
Contributor Author

cruessler commented Oct 15, 2024

I altered the output a bit to be more compact, which should be easier to parse for humans:

Perfect! I had thought about making the output more condensed, but was unsure. Seeing your changes, I now know that I want the output more compact as well. :-)

@cruessler cruessler deleted the add-gix-diff branch October 15, 2024 10:12
@cruessler cruessler mentioned this pull request Oct 15, 2024
1 task
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants