ok/jj
1
0
Fork 0
forked from mirrors/jj
Code Pull requests Activity
jj/demos/demo_git_compat.sh

20 lines
434 B
Bash
Raw Normal View History

demos: add automated demo of cloning Git repo The automation is mostly copied from https://github.com/arxanas/git-branchless/tree/master/demos, so big thanks to @arxanas for writing that!
2021-10-22 16:24:02 +00:00
#!/bin/bash
set -euo pipefail
demos: rename `demo_helpers.sh` and `demo_resolve_conflict.sh` I think it's clearer if only the actual demos started with `demo_`, so I renamed `demo_helpers.sh` to just `helpers.sh`. `demo_resolve_conflict.sh` should match `resolve_conflicts.png` (with an s).
2023-08-28 22:42:44 +00:00
. "$(dirname "$0")"/helpers.sh
demos: add automated demo of cloning Git repo The automation is mostly copied from https://github.com/arxanas/git-branchless/tree/master/demos, so big thanks to @arxanas for writing that!
2021-10-22 16:24:02 +00:00
new_tmp_dir
demos: replace asciinema by screenshots The demos don't need to be animated - the user wouldn't miss anything if they skipped to the end. So let's just show the full output so the user can read through it at their own pace. We could use plain text, but I think the colors are helpful, so I went with screenshots. Closes #166.
2022-10-21 05:13:09 +00:00
comment "Clone a Git repo:"
demos: add automated demo of cloning Git repo The automation is mostly copied from https://github.com/arxanas/git-branchless/tree/master/demos, so big thanks to @arxanas for writing that!
2021-10-22 16:24:02 +00:00
run_command "jj git clone https://github.com/octocat/Hello-World"
run_command "cd Hello-World"
demos: replace asciinema by screenshots The demos don't need to be animated - the user wouldn't miss anything if they skipped to the end. So let's just show the full output so the user can read through it at their own pace. We could use plain text, but I think the colors are helpful, so I went with screenshots. Closes #166.
2022-10-21 05:13:09 +00:00
comment "Inspect it:"
run_command "jj log -r 'all()'"
demos: rearrange and reword portions of demos This is mainly to account for the fact that most commands now report more information about the state of the repo.
2023-09-10 04:17:47 +00:00
blank
demos: add automated demo of cloning Git repo The automation is mostly copied from https://github.com/arxanas/git-branchless/tree/master/demos, so big thanks to @arxanas for writing that!
2021-10-22 16:24:02 +00:00
run_command "jj diff -r b1"
demos: replace asciinema by screenshots The demos don't need to be animated - the user wouldn't miss anything if they skipped to the end. So let's just show the full output so the user can read through it at their own pace. We could use plain text, but I think the colors are helpful, so I went with screenshots. Closes #166.
2022-10-21 05:13:09 +00:00
comment "The repo is backed by the actual Git repo:"
cleanup: update references to `.jj/store/git` to `.jj/repo/store/git` The `store/` directory (and many others) recently moved into `.jj/repo/`, but I forgot to update a few places.
2022-02-18 06:20:14 +00:00
run_command "git --git-dir=.jj/repo/store/git log --graph --all --decorate --oneline"
demos: add blank line at the end This makes it slightly easier to take a screenshot without getting the cursor character from the shell input line just below.
2023-02-09 00:26:55 +00:00
blank
Copy permalink