Ancestors

Written by blinry on 2024-12-29 at 17:56

I've been trying the jujutsu (#jj) version control system over the past few weeks, and I think I really like it! It's Git-compatible, which means that you can use it right now with existing project, and to collaborate with others!

Using it feels similar to when I used git-svn to collaborate with people who insisted on using SVN back in university…

=> More informations about this toot | More toots from blinry@chaos.social

Toot

Written by blinry on 2024-12-29 at 18:01

Here's some things that feel nice about #jj:

• It doesn't force you to deal with conflicts immediately (for example, while you're rebasing a branch). Instead, you can do it later, once you're ready.

• Changes (jj's "commits") have a stable id, even if you rewrite them.

• Anonymous branches! No need to invent silly branch names when the commits already describe what the branch does.

=> More informations about this toot | More toots from blinry@chaos.social

Descendants

Written by blinry on 2024-12-29 at 18:05

• There's no index anymore! Changes you make to files are recorded automatically. Instead of using git add -p to put partial changes in a commit, you can use jj split, and use a diff editor of your choice to split up edits you've done into multiple changes.

• Many commands work on the current working copy by default, but you can also directly run them on older changes! For example, You can jj split an older change into two!

[#]jj

=> More informations about this toot | More toots from blinry@chaos.social

Written by blinry on 2024-12-29 at 18:13

By the way, #jj prevents you accidentally editing changes you've already published. Pushed changes are marked as immutable. But before you publish them, cleaning up your local changes needs less brain cycles for me compared to Git.

Oh! There's also jj undo, allowing you to try new things fearlessly.

Today at #38c3, I accidentally stumbled over a jujutsu table with @timj and others, which was my reminder to tell y'all about this tool! :) I think you might like it!

https://jj-vcs.github.io/jj/latest/

=> More informations about this toot | More toots from blinry@chaos.social

Written by blinry on 2024-12-29 at 18:35

I also wanted to get some input from y'all on a possible UI issue I encountered.

1. Install #jj https://jj-vcs.github.io/jj/latest/install-and-setup/

2. Clone an existing Git repo using a command like jj git clone git@github.com:ethersync/ethersync

3. Show a graph of all changes using jj log -r ::

Now my question is: With your terminal's color scheme, how easy is it for you to differentiate the pink from the gray letters in the change IDs at the beginning of each line?

And do you have a color vision deficiency?

[#]38c3

=> More informations about this toot | More toots from blinry@chaos.social

Written by blinry on 2024-12-29 at 18:39

To get a slightly different perspective on this issue, how hard is it for you to differentiate the pink and grey letters? #jj #38c3

=> More informations about this toot | More toots from blinry@chaos.social

Written by dwardoric on 2024-12-29 at 18:05

@blinry It takes a lot of ideas from Darcs. I'm also tempted however I'm sceptical that "snapshot based" will surface sooner or later and make me mad. ;-)

But great to see that people try to push "beyond git" as it would be terrible to accept it (git) as the status quo.

=> More informations about this toot | More toots from dwardoric@chaos.social

Written by evol on 2024-12-31 at 12:00

@blinry It's very easy but then I also designed my own terminal color theme to make it possible to differentiate between colors based on brightness.

=> View attached media

=> More informations about this toot | More toots from evol@evolved.systems

Written by mad on 2024-12-29 at 18:56

@blinry It's really easy to differentiate between them, but the dark gray itself makes it a bit hard to read. I just image those letters are not important.

=> More informations about this toot | More toots from AE35@hal9.ooo

Written by Lindsey Kuper on 2024-12-29 at 19:35

@blinry I wonder if anyone will find out that they have a color vision deficiency as a result of this post

=> More informations about this toot | More toots from lindsey@recurse.social

Written by Julia Evans on 2024-12-29 at 19:09

@blinry do you run into any problems with files automatically being staged? one thing that put me off jj is that i frequently keep untracked files around for a long time (but don’t want to explicitly .gitignore them for whatever reason) and it’s annoying to have to constantly jj split them

=> More informations about this toot | More toots from b0rk@jvns.ca

Written by Michael Pratt on 2024-12-30 at 07:44

@b0rk @blinry This does bother me a bit. Binaries in particular are problematic because jj doesn’t want to bloat the repo by adding large binaries, so jj status will just completely error out and refuse to do anything if there is an untracked binary.

I don’t have a good solution for this currently.

=> More informations about this toot | More toots from prattmic@hachyderm.io

Written by blinry on 2024-12-31 at 14:25

@b0rk @prattmic

It hasn't been a problem for me yet, since I usually don't keep untracked files around.

But it seems that since version 0.22, you can add

[snapshot]

auto-track = "none()"

to #jj's config file, and it won't automatically start tracking new files!

This comment summarizes it especially well: https://github.com/jj-vcs/jj/issues/323

=> More informations about this toot | More toots from blinry@chaos.social

Written by Julia Evans on 2024-12-31 at 15:58

@blinry oh that's awesome thanks!

=> More informations about this toot | More toots from b0rk@jvns.ca

Written by Carsten 🚀✨ on 2024-12-31 at 17:45

@blinry interesting, I have untracked files a lot too because I use a minority OS in my team. jj sounds interesting, might give it a try on my private machines.

=> More informations about this toot | More toots from cringe@social.tchncs.de