Started adding demos

[martinvonz]

I've started adding demos to the README. I copied the automation from https://github.com/arxanas/git-branchless/tree/master/demos so thank you so much for writing that code, @arxanas! I had some trouble getting it to not use the $PS1 from my Bash configs. I fixed that by doing this. Perhaps you'll want to do something similar.

[martinvonz]

I've added several demos to the README now. I'd appreciate feedback on all aspects: content, speed, workflow, etc.

I'll add more demos of conflict handling and automatic rebase later. Maybe demos of revsets too.

[martinvonz]

There's a typo "id changed" somewhere.

I think that was intentional ("commit id changed") but I've replaced "id" by the more correct "ID" throughout now :)

I missed the demos when skimming through the README because they're minimized.

Fixed.

There's a lot of sequential text. It might be a good idea to add a newline in between different sections

Done. Hopefully it looks better now.

Lately I've been of the opinion that if the demo is more than a few seconds, maybe it's not worth doing.

Interesting. I guess the idea is to have the demos just spark interest, not to explain how things work. That's a larger change. I'll think more about it and will probably update the demos later. I was planning on adding more demos anyway (e.g. for juggling conflicts, revsets, automatic rebase).

[martinvonz]

Unfortunately the asciinema web player seems to use bold instead of bright colors, which makes the highlighting of the checked-out commit much less clear in the demos :(

[arxanas]

Nice, they're looking a lot better.

I think that was intentional ("commit id changed") but I've replaced "id" by the more correct "ID" throughout now :)

Heh, I thought that was supposed to be "commit is changed".

My personal taste would be to liberally use jj log after every operation. In https://asciinema.org/a/uu2yF0FzPiRigbYQYok2PHmX5, surely it would be good to show how the working copy is committed and somewhere else in the graph as soon as you check out away from it? Then again, that might just be because I'm now heavily dependent on viewing the commit graph to do my work...

I see now that the bright rendering isn't so great in Asciinema. It looks like there's a selection of five themes if you go to Edit » Settings, so maybe one of them renders better? I think the only advantage git-branchless has in its graph output is that the current checkout is a filled in glyph, and the rest are hollow:

$ git sl
⋮
◇ 2bbb2f12 17d Create foo
┣━┓
┃ ◯ 0128469f 4m (work) Update foo locally
┃
◆ 6effb47f 2d (master) Update foo remotely  

[martinvonz]

My personal taste would be to liberally use jj log after every operation. In https://asciinema.org/a/uu2yF0FzPiRigbYQYok2PHmX5, surely it would be good to show how the working copy is committed and somewhere else in the graph as soon as you check out away from it?

Oh, I definitely agree! I'll fix that. When demoing this manually, I like to have a split tmux window with watch -n 0.1 jj log running in one of the panes. That makes it quite clear what the effects of any changes in the working copy and any commands are.

t looks like there's a selection of five themes if you go to Edit » Settings, so maybe one of them renders better?

Nice! I changed my default to the Tango theme. That seems to have a much clearer difference between bright and regular colors.

[arxanas]

I was able to follow the demo pretty clearly now that you added the log more often and switched the color scheme. I think I have to go switch the color scheme for my demos now too...