forge
difftastic
forge | difftastic | |
---|---|---|
17 | 68 | |
1,265 | 19,575 | |
1.4% | - | |
9.7 | 9.9 | |
6 days ago | 4 days ago | |
Emacs Lisp | Rust | |
GNU General Public License v3.0 only | MIT License |
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.
forge
-
Introducing Consult-GH
you can clone, browse, modify, fork, make pull requests from Magit without leaving Emacs a single time. checkout https://github.com/magit/forge
-
Cannot save .authinfo.gpg
However, i'm still unable to create issues or pull requests from within forge, returning error in process filter: Failed to submit post: (error http 404 ((message . "Not Found") (documentation_url . "https://developer.github.com/v3/pulls/#create-a-pull-request"))). Do you know how to solve this as well? I've tried looking around for resources, and so far have only come across issue #273 on magit/forge repo, which was resolved using the correct token permissions. My token was set up with the repo, user, and read:org permissions as per the documentation, but am facing the same issue. I have also run (setq url-debug t) for more verbose debugging, but I'm not seeing any additional help either.
-
What do you use for git integration in neovim?
You can also manage via a holistic UI: - Bisection - Log and reflog, stashes - subtrees, submodules - certain third party subcommands like git-absorb, and extend it with your own - interact with issues and pull requests via forge - pretty much all of the hundreds of CLI flags via a modal UI that got generalized and extracted to a lib called transient - well-integrated diff and conflict resolution (which is mostly just smerge) - the rebase/cherry-pick workflows I liked the best, including support for --update-refs - at any time you can always press a key to see the raw commands and output that it's using, which taught me a ton of corner cases - IMO it has a great manual
-
How can I edit magit forge issue comments in Org Mode?
Following up here with a feature request, in case anyone else reading this is interested: https://github.com/magit/forge/discussions/580
-
How I use Emacs as a non-programmer
Yes :). Basically all you need to be able to fork and pull request is the Forge package. It's made from the author of Magit: https://github.com/magit/forge Just follow the manual, you basically need to create a token on GitHub and share it with Forge through your authinfo. I tested it recently (cloned, forked, made changes, committed, pushed and pull request to original repo) and I didn't have to open Firefox even once. https://magit.vc/manual/forge/
-
lab.el - Simple GitLab interface for Emacs. List and act on projects/pipelines/jobs/merge-requests.
how is it different from forge?
-
Recommended workflow for using org-roam to read source code and take notes?
orgit package, which provides Org link types pointing to Magit buffers (including log and revision buffers). Optionally, magit/forge and orgit-forge packages might be useful too, for noting issues and pull requests.
-
Request: Method To Open Project’s GitHub Repository From Projectile?
Not projectile-specific, but see browse-at-remote and forge (of interest are forge-browse-* commands).
-
How do you guys use forge with magit and github?
There is also https://github.com/magit/forge, which I haven't looked at. Instead, I do all the proprietary github things through their proprietary website.
-
What Comes After Git
For magit users, there's https://github.com/magit/forge - ultimately the store of record is still centralized as it's GitHub/GitLab/etc., but it does integrate a local copy of it nicely with your other git operations.
difftastic
-
Linus Torvalds adds arbitrary tabs to kernel code
i want a diff tool that shows me exactly which tokens have changed, and which haven't, regardless of how they are laid out.
These already exist: https://github.com/Wilfred/difftastic
when we get that, then we should get even less merge conflicts.
Counterintuitively, that is not the case. AST-merge is a much, much, much, much, much harder problem than AST-diff.
https://github.com/Wilfred/difftastic?tab=readme-ov-file#can...
The fact that diffs can be used to drive a 3-way merge is in fact an accidental property that arises due to the sheer crudeness of the diff format. As soon as you start using more-sophisticated diff formats, solutions to "the diff problem" no longer lead directly to solutions to "the merge problem".
- FLaNK AI Weekly 25 March 2025
-
Difftastic, a structural diff tool that understands syntax
Yes there is an `—-override` option you can use to specify the language in which a file should be parsed.
https://github.com/Wilfred/difftastic/blob/master/CHANGELOG....
-
So You Think You Know Git – Git Tips and Tricks by Scott Chacon
Use the fantastic difftastic instead of git's diff. https://difftastic.wilfred.me.uk/
[alias]
- Difftastic: A structural diff tool that understands syntax
-
SemanticDiff now supports Rust
difftastic provides similar capabilities in a free tool based on treesitter
-
My programming language aware diff for VS Code and GitHub now supports Rust
difftastic? https://github.com/Wilfred/difftastic
-
Prettier $20k Bounty was Claimed
If you're looking for a VS Code extension or a GitHub app, check out https://semanticdiff.com/. I'm a co-founder of this project.
If you prefer a CLI tool, check out https://github.com/Wilfred/difftastic. It supports more languages, but doesn't recognize when code has been replaced by an equivalent version ("invariances"). So it will show some changes (e.g. replacing a character in a string with an escape sequence) even though they are technically equivalent.
-
Pijul: Version-Control Post-Git • Goto 2023
Shameless plug: I've written difftastic[1], a tool that builds ASTs and then does a structural diff of them. You can use it with git too.
It's an incredibly hard problem though, both from a computational complexity point of view, and trying to build a comprehensible UI once you've done the structural AST diff.
[1]: https://github.com/wilfred/difftastic
-
Always leave a trailing comma in Python lists, dicts, tuples
There is a diff tool called difftastic: https://github.com/Wilfred/difftastic
The idea is that it does not show diff based on text change, but on syntastic meaning. For that, it uses tree-sitter.
I think it still shows the trailing comma in the situation as shown in the article, but it's quite different experience than the standard text based diff.
What are some alternatives?
magit - It's Magit! A Git Porcelain inside Emacs.
delta - A syntax-highlighting pager for git, diff, and grep output
git-madge - :rocket: Git-aware madge wrapper
diffsitter - A tree-sitter based AST difftool to get meaningful semantic diffs
Tiling-Assistant - An extension which adds a Windows-like snap assist to GNOME. It also expands GNOME's 2 column tiling layout.
neogit - An interactive and powerful Git interface for Neovim, inspired by Magit
josh - Just One Single History
Visual Studio Code - Visual Studio Code
git-heatmap - :bar_chart: Display a heatmap for oft-edited files
gumtree - An awesome code differencing tool
got - Got is like git, but with an 'o'
tree-sitter-cpp - C++ grammar for tree-sitter