bisect: make abort into a non-error 975ef64c parent 9b02f868

An aborted bisect is currently treated like an error. This means that once an abort is triggered, any follow-up code from the bisection CLI doesn't get run. Change the bisector to treat an aborted command as any other evaluation and have it return an aborted result when it encounters it. This could be important for many future developments (putting bisect status in the op-log, interactive bisects, querying the state of a currently running bisect), but right now, it's mostly important for printing the reminder text about the right place to restore to in the op-log :)

authored by Daniel Morsing

jj / demos

..
README.md demos: add demos/README.md and run scripts to generate SVGs
 		2 years ago
demo_git_compat.sh demos: update demo scripts with recent changes
 		3 months ago
demo_juggle_conflicts.sh demos: update demo scripts with recent changes
 		3 months ago
demo_operation_log.sh demos: update demo scripts with recent changes
 		3 months ago
demo_resolve_conflicts.sh demos: update demo scripts with recent changes
 		3 months ago
demo_working_copy.sh demos: update, replace `branch` with `bookmark`
 		1 year ago
git_compat.png demos: re-generate demo images 3 months ago
git_compat.svg demos: re-generate demo images 3 months ago
helpers.sh demos: fixup, working_copy.png wasn't regenerated properly
 		1 year ago
juggle_conflicts.png demos: update demos for conflicts
 		3 months ago
juggle_conflicts.svg demos: update demos for conflicts
 		3 months ago
operation_log.png demos: re-generate demo images 3 months ago
operation_log.svg demos: re-generate demo images 3 months ago
resolve_conflicts.png demos: update demos for conflicts
 		3 months ago
resolve_conflicts.svg demos: update demos for conflicts
 		3 months ago
run_scripts.sh demos/run_script.sh: fix ImageMagick invocation
 		1 year ago
setup_standard_config.sh demos: make `jj` perform the line wrapping instead of `term-transcript`
 		2 years ago
working_copy.png demos: re-generate demo images 3 months ago
working_copy.svg demos: re-generate demo images 3 months ago

README.md

Screenshots with demos and scripts to generate them

The demo_*.sh scripts in this directory demo various features of jj.

The run_scripts.sh script can be used to:

  • Run them inside a standardized environment instead of the user’s local environment.
  • Generate SVG and PNG images for the scripts.

The PNG images in the repo may be slightly older, as they take up more space in the repo.

The SVG images have human-readable diffs, but may look different on different computers with different fonts installed.

Running run_scripts.sh

This requires ImageMagick and term-transcript-cli to be installed. See run_scripts.sh’s error messages for some more details. On Debian Linux, it also seems helpful to sudo apt install inkscape; ImageMagick seems to use either Inkscape itself or some dependency of it.

One way to make all the images and check the output is:

cd demos

./run_scripts.sh demo_*.sh |less

A note on fonts

The exact PNG output depends on the fonts you have installed on your system.

The screenshots are usually generated on a Debian Linux system and use the “Fira Code” font. It can be installed with sudo apt install fonts-firacode. It seems to include all relevant Unicode symbols and be a little bolder and thus more readable than the “Liberation Mono” font, which is used if Fira Code is not installed. That font also works OK. See the CSS font specification in run_scripts.sh for other fonts tried (especially when viewing SVGs on the web). If none apply, the default monospace font will be used.

convert -list Fonts will list the fonts ImageMagick is aware of.