git-machete
gumtree
git-machete | gumtree | |
---|---|---|
2 | 6 | |
837 | 861 | |
2.4% | 1.3% | |
9.2 | 8.2 | |
9 days ago | 16 days ago | |
Python | Java | |
MIT License | GNU Lesser General Public License v3.0 only |
Stars - the number of stars that a project has on GitHub. Growth - month over month growth in stars.
Activity is a relative number indicating how actively a project is being developed. Recent commits have higher weight than older ones.
For example, an activity of 9.0 indicates that a project is amongst the top 10% of the most actively developed projects that we are tracking.
git-machete
- Git Machete
-
Pijul: Version-Control Post-Git • Goto 2023
I'm not seeing a git compatibility layer? So I think it's a neat project, but I probably won't try it because nearly all code is rooted squarely in git. Even if Pijul is perfect, you'd need to convince everyone else to use it.
Nevertheless, the increased interest in moving to patch based workflows from branch based ones is great. There's a lot of similar tools here (https://github.com/gitext-rs/git-stack/blob/main/docs/compar...) which I refer to infrequently.
Personally my favorite tool for living-with-the-reality-that-is-branches is git-machete (https://github.com/VirtusLab/git-machete).
gumtree
-
Pijul: Version-Control Post-Git • Goto 2023
I'm not familiar with Pijul, and haven't finished watching this presentation, but IME the problems with modern version control tools is that they still rely on comparing lines of plain text, something we've been doing for decades. Merge conflicts are an issue because our tools are agnostic about the actual content they're tracking.
Instead, the tools should be smarter and work on the level of functions, classes, packages, sentences, paragraphs, or whatever primitive makes sense for the project and file that is being changed. In the case of code bases, they need to be aware of the language and the AST of the program. For binary files, they need to be aware of the file format and its binary structure. This would allow them to show actually meaningful diffs, and minimize the chances of conflicts, and of producing a corrupt file after an automatic merge.
There has been some research in this area, and there are a few semantic diffing tools[1,2,3], but I'm not aware of this being widely used in any VCS.
Nowadays, with all the machine learning advances, the ideal VCS should also use ML to understand the change at a deeper level, and maybe even suggest improvements. If AI can write code for me, it could surely understand what I'm trying to do, and help me so that version control is entirely hands-free, instead of having to fight with it, and be constantly aware of it, as I have to do now.
I just finished watching the presentation, and Pijul seems like an iterative improvement over Git. Nothing jumped out at me like a killer feature that would make me want to give it a try. It might be because the author focuses too much on technical details, instead of taking a step back and rethinking what a modern VCS tool should look like today.
[1]: https://semanticdiff.com/
[2]: https://github.com/trailofbits/graphtage
[3]: https://github.com/GumTreeDiff/gumtree
-
We should format code on demand
There’s also gumtree: https://github.com/GumTreeDiff/gumtree/wiki/Languages
- Difftastic: Syntax-aware structured diff tool
-
A New Era for Mechanical CAD
GumTree does AST level diffing, hypothetically one could build VCS on top of that. That would work for binary files as long as they are parseable to some sort of sensible AST.
https://github.com/GumTreeDiff/gumtree
- Gumtree: A neat code differencing tool
-
What comes after Git? It's been 15 years since it was created. SVN was created 5 years before Git. CVS was 15 years before SVN
There are a few AST-based diffing programs e.g. GumTreeDiff. I haven't tried any of them though.
What are some alternatives?
SemanticDiff - Community support for SemanticDiff, the programming language aware diff for Visual Studio Code and GitHub.
difftastic - a structural diff that understands syntax 🟥🟩
git-stack - Stacked branch management for Git
locust - "git diff" over abstract syntax trees
git-mergify-rebase - Merge git changes one commit at a time.
git-bug - Distributed, offline-first bug tracker embedded in git, with bridges
mergify - Merge git changes on commit at a time.
diffr - Yet another diff highlighting tool
git-imerge - Incremental merge for git
apheleia - 🌷 Run code formatter on buffer contents without moving point, using RCS patches and dynamic programming.
awesome-structure-editors - A list of projectional and structural editors