mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2024-12-26 14:00:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6
jj/demos/demo_working_copy.sh

59 lines
1.8 KiB
Bash
Raw Normal View History

demos: add demo of automatic working copy commit
2021-10-22 20:56:30 +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 demo of automatic working copy commit
2021-10-22 20:56:30 +00:00
new_tmp_dir
demos: changes related to the new default log revset We remove some branches that would be shown by default and remove `-r 'all()'` where it's no longer necessary.
2023-09-10 04:17:47 +00:00
{
jj git clone https://github.com/octocat/Hello-World
cd Hello-World
demos: update demos as little as possible to regenerate them This updates demos to the point where they can run without warnings. Some of them become less clear, this is addressed (where I noticed it) in follow-up commits. Fixes #3209
2024-08-08 05:00:46 +00:00
jj abandon --ignore-immutable test@origin
demos: update, replace `branch` with `bookmark` The replacement is not purely mechanical, some text is also adjusted to talk about bookmarks.
2024-09-29 21:01:37 +00:00
jj bookmark forget test
demos: update demos as little as possible to regenerate them This updates demos to the point where they can run without warnings. Some of them become less clear, this is addressed (where I noticed it) in follow-up commits. Fixes #3209
2024-08-08 05:00:46 +00:00
jj abandon --ignore-immutable octocat-patch-1@origin
demos: update, replace `branch` with `bookmark` The replacement is not purely mechanical, some text is also adjusted to talk about bookmarks.
2024-09-29 21:01:37 +00:00
jj bookmark forget octocat-patch-1
demos: update demos as little as possible to regenerate them This updates demos to the point where they can run without warnings. Some of them become less clear, this is addressed (where I noticed it) in follow-up commits. Fixes #3209
2024-08-08 05:00:46 +00:00
}> /dev/null 2>&1
demos: add demo of automatic working copy commit
2021-10-22 20:56:30 +00:00
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 "We are in the octocat/Hello-World repo.
We have an empty working copy on top of master:"
demos: add more `jj log` calls to the working-copy demo Thanks to @arxanas for the suggestion.
2021-10-28 03:38:56 +00:00
run_command "jj log"
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
run_command "jj status"
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 "Now make some changes in the working copy:"
demos: add demo of automatic working copy commit
2021-10-22 20:56:30 +00:00
run_command "echo \"Goodbye World!\" > README"
run_command "echo stuff > new-file"
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
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
comment "Because of these changes, our working copy is no longer marked as \"(empty)\".
Also, its commit ID (starting with a blue character) changed:"
demos: add demo of automatic working copy commit
2021-10-22 20:56:30 +00:00
run_command "jj status"
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
demos: update, replace `branch` with `bookmark` The replacement is not purely mechanical, some text is also adjusted to talk about bookmarks.
2024-09-29 21:01:37 +00:00
comment "Add a bookmark so we can easily refer to this
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
commit:"
demos: update, replace `branch` with `bookmark` The replacement is not purely mechanical, some text is also adjusted to talk about bookmarks.
2024-09-29 21:01:37 +00:00
run_command "jj bookmark create goodbye"
demos: add more `jj log` calls to the working-copy demo Thanks to @arxanas for the suggestion.
2021-10-28 03:38:56 +00:00
run_command "jj log"
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 "Start working on a new change off of master:"
demos: update demos as little as possible to regenerate them This updates demos to the point where they can run without warnings. Some of them become less clear, this is addressed (where I noticed it) in follow-up commits. Fixes #3209
2024-08-08 05:00:46 +00:00
run_command "jj new master"
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
comment "Note that we were told the working copy is now empty (AKA clean). The
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
\"goodbye\" change stayed in its own commit:"
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
run_command "jj log"
comment "Let's do a sanity check: 'jj status' should tell us that
the working copy is clean."
demos: add demo of automatic working copy commit
2021-10-22 20:56:30 +00:00
run_command "jj status"
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 "Modify a file in this new change:"
demos: add demo of automatic working copy commit
2021-10-22 20:56:30 +00:00
run_command "echo \"Hello everyone!\" > README"
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
run_command "jj status"
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 working copy is not special; we can, for
example, set the description of any commit.
First, set it on the working copy:"
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
# The output with the description of the working copy slightly messes up the
# parallel between the working copy and another commit, so we redact it.
run_command_output_redacted "jj describe -m everyone"
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 "Now set it on the change we worked on before:"
demos: add demo of automatic working copy commit
2021-10-22 20:56:30 +00:00
run_command "jj describe goodbye -m goodbye"
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 the result:"
demos: add demo of automatic working copy commit
2021-10-22 20:56:30 +00:00
run_command "jj log"
Reference in a new issue Copy permalink