Skip to content

Commit

Permalink
demos: changes related to the new default log revset
Browse files Browse the repository at this point in the history
We remove some branches that would be shown by default and
remove `-r 'all()'` where it's no longer necessary.
  • Loading branch information
ilyagr committed Oct 4, 2023
1 parent 9b979e8 commit 4bcabc2
Show file tree
Hide file tree
Showing 8 changed files with 336 additions and 362 deletions.
8 changes: 6 additions & 2 deletions demos/demo_operation_log.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,12 @@ set -euo pipefail
. "$(dirname "$0")"/helpers.sh

new_tmp_dir
jj git clone https://github.com/octocat/Hello-World > /dev/null
cd Hello-World
{
jj git clone https://github.com/octocat/Hello-World
cd Hello-World
jj abandon octocat-patch-1
jj branch forget octocat-patch-1
} > /dev/null

comment "We are in the octocat/Hello-World repo.
The \"operation log\" shows the operations
Expand Down
12 changes: 8 additions & 4 deletions demos/demo_resolve_conflicts.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,16 @@ set -euo pipefail
. "$(dirname "$0")"/helpers.sh

new_tmp_dir
jj git clone https://github.com/octocat/Hello-World > /dev/null
cd Hello-World
{
jj git clone https://github.com/octocat/Hello-World
cd Hello-World
jj abandon test
jj branch delete test
} > /dev/null

comment "We are on the master branch of the
octocat/Hello-World repo:"
run_command "jj log -r 'all()'"
run_command "jj log"

comment "Let's make an edit that will conflict
when we rebase it:"
Expand All @@ -29,7 +33,7 @@ run_command "jj rebase -d b1"

comment "That seemed to succeed but we are also told there is now a conflict.
Let's take a look at the repo:"
run_command "jj log -r 'all()'"
run_command "jj log"
run_command "jj status"

comment "Indeed, the rebased commit has a conflict. The conflicted file
Expand Down
10 changes: 8 additions & 2 deletions demos/demo_working_copy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,14 @@ set -euo pipefail
. "$(dirname "$0")"/helpers.sh

new_tmp_dir
jj git clone https://github.com/octocat/Hello-World > /dev/null
cd Hello-World
{
jj git clone https://github.com/octocat/Hello-World
cd Hello-World
jj abandon test
jj branch forget test
jj abandon octocat-patch-1
jj branch forget octocat-patch-1
}> /dev/null

comment "We are in the octocat/Hello-World repo.
We have an empty working copy on top of master:"
Expand Down
18 changes: 9 additions & 9 deletions demos/git_compat.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 4bcabc2

Please sign in to comment.