ok/jj
1
0
Fork 0
forked from mirrors/jj
Code Pull requests Activity

demos: fixup, working_copy.png wasn't regenerated properly

Browse source 
The "redacted output" wasn't properly redacted.

Also removed extraneous comment, and added a comment since
the new PNGs are larger than I expected.
This commit is contained in:
Ilya Grigoriev 2024-09-05 17:38:46 -07:00
parent 6ea46b930b
commit 8f603f1a9c
4 changed files with 43 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
demos/helpers.sh
View file

@ -18,8 +18,6 @@ run_command() {
run_command_output_redacted() {
echo "\$ $@"
# `bash` often resets $COLUMNS, so we also
# allow $RUN_COMMAND_COLUMNS
eval "$@" > /dev/null 2>&1
echo -e "\033[0;90m... (output redacted) ...\033[0m"
}

7
demos/run_scripts.sh
View file

@ -70,4 +70,11 @@ for script in "$@"; do
-colors 63 -background black -resize 100% \
"$script_base".png \
|| true
# TODO/FIXME: The above command doesn't seem to work properly;
# the PNG files end up larger than they should be and are RGB
# as opposed to expected indexed 63-color. This is caused by
# https://github.com/martinvonz/jj/commit/6d573ef6d7a45151495de18b6f4c5063ce39f6bd
# and
# https://github.com/martinvonz/jj/commit/42dee7d08ce8e362cf9d44f844b25e001b6ac94f
# and needs debugging of ImageMagick invocations.
done

BIN
demos/working_copy.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 308 KiB

After

Width:  |  Height:  |  Size: 293 KiB

75
demos/working_copy.svg
View file

@ -1,5 +1,5 @@
<!-- Created with term-transcript v0.3.0 (https://github.com/slowli/term-transcript) -->
<svg viewBox="0 0 720 1946" width="720" height="1946" xmlns="http://www.w3.org/2000/svg">
<svg viewBox="0 0 720 1892" width="720" height="1892" xmlns="http://www.w3.org/2000/svg">
<style>
.container {
font: 14px Fira Code, Liberation Mono, SFMono-Regular, Consolas, Menlo, monospace;
@ -33,22 +33,22 @@
.fg15 { fill: #f2f2f2; } .output-bg .fg15 { stroke: #f2f2f2; }
</style>
<rect width="100%" height="100%" y="0" rx="4.5" style="fill: #0c0c0c;" />
<svg x="0" y="10" width="720" height="1926" viewBox="0 0 720 1926">
<svg x="0" y="10" width="720" height="1872" viewBox="0 0 720 1872">
<g class="input-bg"></g>
<text class="container fg7"><tspan xml:space="preserve" x="10" y="14" class="output">
</tspan><tspan xml:space="preserve" x="10" y="32" class="output"><tspan class="fg2"># We are in the octocat/Hello-World repo.</tspan>
</tspan><tspan xml:space="preserve" x="10" y="50" class="output"><tspan class="fg2"># We have an empty working copy on top of master:</tspan>
</tspan><tspan xml:space="preserve" x="10" y="68" class="output">
</tspan><tspan xml:space="preserve" x="10" y="86" class="output">$ jj log
</tspan><tspan xml:space="preserve" x="10" y="104" class="output"><tspan class="bold fg2">@</tspan>  <tspan class="bold fg13">t</tspan><tspan class="bold fg8">tmypqzs</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">jjfan@example.com</tspan><tspan class="bold"> </tspan><tspan class="bold fg14">2024-09-04 19:21:13</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">2</tspan><tspan class="bold fg8">1dac130</tspan>
</tspan><tspan xml:space="preserve" x="10" y="104" class="output"><tspan class="bold fg2">@</tspan>  <tspan class="bold fg13">oz</tspan><tspan class="bold fg8">smopnz</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">jjfan@example.com</tspan><tspan class="bold"> </tspan><tspan class="bold fg14">2024-09-05 17:44:52</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">f</tspan><tspan class="bold fg8">b3dbcd1</tspan>
</tspan><tspan xml:space="preserve" x="10" y="122" class="output">│  <tspan class="bold fg10">(empty)</tspan><tspan class="bold"> </tspan><tspan class="bold fg10">(no description set)</tspan>
</tspan><tspan xml:space="preserve" x="10" y="140" class="output"><tspan class="bold fg14">◆</tspan>  <tspan class="bold fg5">o</tspan><tspan class="fg8">rrkosyo</tspan> <tspan class="fg3">octocat@nowhere.com</tspan> <tspan class="fg6">2012-03-06 16:06:50</tspan> <tspan class="fg5">master</tspan> <tspan class="bold fg4">7</tspan><tspan class="fg8">fd1a60b</tspan>
</tspan><tspan xml:space="preserve" x="10" y="140" class="output"><tspan class="bold fg14">◆</tspan>  <tspan class="bold fg5">or</tspan><tspan class="fg8">rkosyo</tspan> <tspan class="fg3">octocat@nowhere.com</tspan> <tspan class="fg6">2012-03-06 16:06:50</tspan> <tspan class="fg5">master</tspan> <tspan class="bold fg4">7</tspan><tspan class="fg8">fd1a60b</tspan>
</tspan><tspan xml:space="preserve" x="10" y="158" class="output">│  <tspan class="fg2">(empty)</tspan> Merge pull request #6 from Spaceghost/patch-1
</tspan><tspan xml:space="preserve" x="10" y="176" class="output">~
</tspan><tspan xml:space="preserve" x="10" y="194" class="output">$ jj status
</tspan><tspan xml:space="preserve" x="10" y="212" class="output">The working copy is clean
</tspan><tspan xml:space="preserve" x="10" y="230" class="output">Working copy : <tspan class="bold fg13">t</tspan><tspan class="bold fg8">tmypqzs</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">2</tspan><tspan class="bold fg8">1dac130</tspan><tspan class="bold"> </tspan><tspan class="bold fg10">(empty)</tspan><tspan class="bold"> </tspan><tspan class="bold fg10">(no description set)</tspan>
</tspan><tspan xml:space="preserve" x="10" y="248" class="output">Parent commit: <tspan class="bold fg5">o</tspan><tspan class="fg8">rrkosyo</tspan> <tspan class="bold fg4">7</tspan><tspan class="fg8">fd1a60b</tspan> <tspan class="fg5">master</tspan><tspan class="fg8"> | </tspan><tspan class="fg2">(empty)</tspan> Merge pull request #6 from Spa<tspan class="hard-br" rotate="45" dx=".1em" dy="-.2em">↓</tspan>
</tspan><tspan xml:space="preserve" x="10" y="230" class="output">Working copy : <tspan class="bold fg13">oz</tspan><tspan class="bold fg8">smopnz</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">f</tspan><tspan class="bold fg8">b3dbcd1</tspan><tspan class="bold"> </tspan><tspan class="bold fg10">(empty)</tspan><tspan class="bold"> </tspan><tspan class="bold fg10">(no description set)</tspan>
</tspan><tspan xml:space="preserve" x="10" y="248" class="output">Parent commit: <tspan class="bold fg5">or</tspan><tspan class="fg8">rkosyo</tspan> <tspan class="bold fg4">7</tspan><tspan class="fg8">fd1a60b</tspan> <tspan class="fg5">master</tspan><tspan class="fg8"> | </tspan><tspan class="fg2">(empty)</tspan> Merge pull request #6 from Spa<tspan class="hard-br" rotate="45" dx=".1em" dy="-.2em">↓</tspan>
</tspan><tspan xml:space="preserve" x="10" y="266" class="output">ceghost/patch-1
</tspan><tspan xml:space="preserve" x="10" y="284" class="output">
</tspan><tspan xml:space="preserve" x="10" y="302" class="output"><tspan class="fg2"># Now make some changes in the working copy:</tspan>
@ -63,27 +63,27 @@
</tspan><tspan xml:space="preserve" x="10" y="464" class="output">Working copy changes:
</tspan><tspan xml:space="preserve" x="10" y="482" class="output"><tspan class="fg6">M README</tspan>
</tspan><tspan xml:space="preserve" x="10" y="500" class="output"><tspan class="fg2">A new-file</tspan>
</tspan><tspan xml:space="preserve" x="10" y="518" class="output">Working copy : <tspan class="bold fg13">t</tspan><tspan class="bold fg8">tmypqzs</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">a</tspan><tspan class="bold fg8">3925f25</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">(no description set)</tspan>
</tspan><tspan xml:space="preserve" x="10" y="536" class="output">Parent commit: <tspan class="bold fg5">o</tspan><tspan class="fg8">rrkosyo</tspan> <tspan class="bold fg4">7</tspan><tspan class="fg8">fd1a60b</tspan> <tspan class="fg5">master</tspan><tspan class="fg8"> | </tspan><tspan class="fg2">(empty)</tspan> Merge pull request #6 from Spa<tspan class="hard-br" rotate="45" dx=".1em" dy="-.2em">↓</tspan>
</tspan><tspan xml:space="preserve" x="10" y="518" class="output">Working copy : <tspan class="bold fg13">oz</tspan><tspan class="bold fg8">smopnz</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">e</tspan><tspan class="bold fg8">667643c</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">(no description set)</tspan>
</tspan><tspan xml:space="preserve" x="10" y="536" class="output">Parent commit: <tspan class="bold fg5">or</tspan><tspan class="fg8">rkosyo</tspan> <tspan class="bold fg4">7</tspan><tspan class="fg8">fd1a60b</tspan> <tspan class="fg5">master</tspan><tspan class="fg8"> | </tspan><tspan class="fg2">(empty)</tspan> Merge pull request #6 from Spa<tspan class="hard-br" rotate="45" dx=".1em" dy="-.2em">↓</tspan>
</tspan><tspan xml:space="preserve" x="10" y="554" class="output">ceghost/patch-1
</tspan><tspan xml:space="preserve" x="10" y="572" class="output">
</tspan><tspan xml:space="preserve" x="10" y="590" class="output"><tspan class="fg2"># Add a branch so we can easily refer to this</tspan>
</tspan><tspan xml:space="preserve" x="10" y="608" class="output"><tspan class="fg2"># commit:</tspan>
</tspan><tspan xml:space="preserve" x="10" y="626" class="output">
</tspan><tspan xml:space="preserve" x="10" y="644" class="output">$ jj branch create goodbye
</tspan><tspan xml:space="preserve" x="10" y="662" class="output">Created 1 branches pointing to <tspan class="bold fg5">t</tspan><tspan class="fg8">tmypqzs</tspan> <tspan class="bold fg4">a</tspan><tspan class="fg8">3925f25</tspan> <tspan class="fg5">goodbye</tspan><tspan class="fg8"> | </tspan><tspan class="fg3">(no description set)</tspan>
</tspan><tspan xml:space="preserve" x="10" y="662" class="output">Created 1 branches pointing to <tspan class="bold fg5">oz</tspan><tspan class="fg8">smopnz</tspan> <tspan class="bold fg4">e</tspan><tspan class="fg8">667643c</tspan> <tspan class="fg5">goodbye</tspan><tspan class="fg8"> | </tspan><tspan class="fg3">(no description set)</tspan>
</tspan><tspan xml:space="preserve" x="10" y="680" class="output">$ jj log
</tspan><tspan xml:space="preserve" x="10" y="698" class="output"><tspan class="bold fg2">@</tspan>  <tspan class="bold fg13">t</tspan><tspan class="bold fg8">tmypqzs</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">jjfan@example.com</tspan><tspan class="bold"> </tspan><tspan class="bold fg14">2024-09-04 19:21:13</tspan><tspan class="bold"> </tspan><tspan class="bold fg13">goodbye</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">a</tspan><tspan class="bold fg8">3925f25</tspan>
</tspan><tspan xml:space="preserve" x="10" y="698" class="output"><tspan class="bold fg2">@</tspan>  <tspan class="bold fg13">oz</tspan><tspan class="bold fg8">smopnz</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">jjfan@example.com</tspan><tspan class="bold"> </tspan><tspan class="bold fg14">2024-09-05 17:44:52</tspan><tspan class="bold"> </tspan><tspan class="bold fg13">goodbye</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">e</tspan><tspan class="bold fg8">667643c</tspan>
</tspan><tspan xml:space="preserve" x="10" y="716" class="output">│  <tspan class="bold fg3">(no description set)</tspan>
</tspan><tspan xml:space="preserve" x="10" y="734" class="output"><tspan class="bold fg14">◆</tspan>  <tspan class="bold fg5">o</tspan><tspan class="fg8">rrkosyo</tspan> <tspan class="fg3">octocat@nowhere.com</tspan> <tspan class="fg6">2012-03-06 16:06:50</tspan> <tspan class="fg5">master</tspan> <tspan class="bold fg4">7</tspan><tspan class="fg8">fd1a60b</tspan>
</tspan><tspan xml:space="preserve" x="10" y="734" class="output"><tspan class="bold fg14">◆</tspan>  <tspan class="bold fg5">or</tspan><tspan class="fg8">rkosyo</tspan> <tspan class="fg3">octocat@nowhere.com</tspan> <tspan class="fg6">2012-03-06 16:06:50</tspan> <tspan class="fg5">master</tspan> <tspan class="bold fg4">7</tspan><tspan class="fg8">fd1a60b</tspan>
</tspan><tspan xml:space="preserve" x="10" y="752" class="output">│  <tspan class="fg2">(empty)</tspan> Merge pull request #6 from Spaceghost/patch-1
</tspan><tspan xml:space="preserve" x="10" y="770" class="output">~
</tspan><tspan xml:space="preserve" x="10" y="788" class="output">
</tspan><tspan xml:space="preserve" x="10" y="806" class="output"><tspan class="fg2"># Start working on a new change off of master:</tspan>
</tspan><tspan xml:space="preserve" x="10" y="824" class="output">
</tspan><tspan xml:space="preserve" x="10" y="842" class="output">$ jj new master
</tspan><tspan xml:space="preserve" x="10" y="860" class="output">Working copy now at: <tspan class="bold fg13">s</tspan><tspan class="bold fg8">ykquxrt</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">9</tspan><tspan class="bold fg8">412b8bb</tspan><tspan class="bold"> </tspan><tspan class="bold fg10">(empty)</tspan><tspan class="bold"> </tspan><tspan class="bold fg10">(no description set)</tspan>
</tspan><tspan xml:space="preserve" x="10" y="878" class="output">Parent commit      : <tspan class="bold fg5">o</tspan><tspan class="fg8">rrkosyo</tspan> <tspan class="bold fg4">7</tspan><tspan class="fg8">fd1a60b</tspan> <tspan class="fg5">master</tspan><tspan class="fg8"> | </tspan><tspan class="fg2">(empty)</tspan> Merge pull request #6 fr<tspan class="hard-br" rotate="45" dx=".1em" dy="-.2em">↓</tspan>
</tspan><tspan xml:space="preserve" x="10" y="860" class="output">Working copy now at: <tspan class="bold fg13">q</tspan><tspan class="bold fg8">ulnmsro</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">c</tspan><tspan class="bold fg8">ece88b0</tspan><tspan class="bold"> </tspan><tspan class="bold fg10">(empty)</tspan><tspan class="bold"> </tspan><tspan class="bold fg10">(no description set)</tspan>
</tspan><tspan xml:space="preserve" x="10" y="878" class="output">Parent commit      : <tspan class="bold fg5">or</tspan><tspan class="fg8">rkosyo</tspan> <tspan class="bold fg4">7</tspan><tspan class="fg8">fd1a60b</tspan> <tspan class="fg5">master</tspan><tspan class="fg8"> | </tspan><tspan class="fg2">(empty)</tspan> Merge pull request #6 fr<tspan class="hard-br" rotate="45" dx=".1em" dy="-.2em">↓</tspan>
</tspan><tspan xml:space="preserve" x="10" y="896" class="output">om Spaceghost/patch-1
</tspan><tspan xml:space="preserve" x="10" y="914" class="output">Added 0 files, modified 1 files, removed 1 files
</tspan><tspan xml:space="preserve" x="10" y="932" class="output">
@ -91,11 +91,11 @@
</tspan><tspan xml:space="preserve" x="10" y="968" class="output"><tspan class="fg2"># "goodbye" change stayed in its own commit:</tspan>
</tspan><tspan xml:space="preserve" x="10" y="986" class="output">
</tspan><tspan xml:space="preserve" x="10" y="1004" class="output">$ jj log
</tspan><tspan xml:space="preserve" x="10" y="1022" class="output"><tspan class="bold fg2">@</tspan>  <tspan class="bold fg13">s</tspan><tspan class="bold fg8">ykquxrt</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">jjfan@example.com</tspan><tspan class="bold"> </tspan><tspan class="bold fg14">2024-09-04 19:21:14</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">9</tspan><tspan class="bold fg8">412b8bb</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1022" class="output"><tspan class="bold fg2">@</tspan>  <tspan class="bold fg13">q</tspan><tspan class="bold fg8">ulnmsro</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">jjfan@example.com</tspan><tspan class="bold"> </tspan><tspan class="bold fg14">2024-09-05 17:44:51</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">c</tspan><tspan class="bold fg8">ece88b0</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1040" class="output">│  <tspan class="bold fg10">(empty)</tspan><tspan class="bold"> </tspan><tspan class="bold fg10">(no description set)</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1058" class="output">│ ○  <tspan class="bold fg5">t</tspan><tspan class="fg8">tmypqzs</tspan> <tspan class="fg3">jjfan@example.com</tspan> <tspan class="fg6">2024-09-04 19:21:13</tspan> <tspan class="fg5">goodbye</tspan> <tspan class="bold fg4">a</tspan><tspan class="fg8">3925f25</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1058" class="output">│ ○  <tspan class="bold fg5">oz</tspan><tspan class="fg8">smopnz</tspan> <tspan class="fg3">jjfan@example.com</tspan> <tspan class="fg6">2024-09-05 17:44:52</tspan> <tspan class="fg5">goodbye</tspan> <tspan class="bold fg4">e</tspan><tspan class="fg8">667643c</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1076" class="output">├─╯  <tspan class="fg3">(no description set)</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1094" class="output"><tspan class="bold fg14">◆</tspan>  <tspan class="bold fg5">o</tspan><tspan class="fg8">rrkosyo</tspan> <tspan class="fg3">octocat@nowhere.com</tspan> <tspan class="fg6">2012-03-06 16:06:50</tspan> <tspan class="fg5">master</tspan> <tspan class="bold fg4">7</tspan><tspan class="fg8">fd1a60b</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1094" class="output"><tspan class="bold fg14">◆</tspan>  <tspan class="bold fg5">or</tspan><tspan class="fg8">rkosyo</tspan> <tspan class="fg3">octocat@nowhere.com</tspan> <tspan class="fg6">2012-03-06 16:06:50</tspan> <tspan class="fg5">master</tspan> <tspan class="bold fg4">7</tspan><tspan class="fg8">fd1a60b</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1112" class="output">│  <tspan class="fg2">(empty)</tspan> Merge pull request #6 from Spaceghost/patch-1
</tspan><tspan xml:space="preserve" x="10" y="1130" class="output">~
</tspan><tspan xml:space="preserve" x="10" y="1148" class="output">
@ -104,8 +104,8 @@
</tspan><tspan xml:space="preserve" x="10" y="1202" class="output">
</tspan><tspan xml:space="preserve" x="10" y="1220" class="output">$ jj status
</tspan><tspan xml:space="preserve" x="10" y="1238" class="output">The working copy is clean
</tspan><tspan xml:space="preserve" x="10" y="1256" class="output">Working copy : <tspan class="bold fg13">s</tspan><tspan class="bold fg8">ykquxrt</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">9</tspan><tspan class="bold fg8">412b8bb</tspan><tspan class="bold"> </tspan><tspan class="bold fg10">(empty)</tspan><tspan class="bold"> </tspan><tspan class="bold fg10">(no description set)</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1274" class="output">Parent commit: <tspan class="bold fg5">o</tspan><tspan class="fg8">rrkosyo</tspan> <tspan class="bold fg4">7</tspan><tspan class="fg8">fd1a60b</tspan> <tspan class="fg5">master</tspan><tspan class="fg8"> | </tspan><tspan class="fg2">(empty)</tspan> Merge pull request #6 from Spa<tspan class="hard-br" rotate="45" dx=".1em" dy="-.2em">↓</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1256" class="output">Working copy : <tspan class="bold fg13">q</tspan><tspan class="bold fg8">ulnmsro</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">c</tspan><tspan class="bold fg8">ece88b0</tspan><tspan class="bold"> </tspan><tspan class="bold fg10">(empty)</tspan><tspan class="bold"> </tspan><tspan class="bold fg10">(no description set)</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1274" class="output">Parent commit: <tspan class="bold fg5">or</tspan><tspan class="fg8">rkosyo</tspan> <tspan class="bold fg4">7</tspan><tspan class="fg8">fd1a60b</tspan> <tspan class="fg5">master</tspan><tspan class="fg8"> | </tspan><tspan class="fg2">(empty)</tspan> Merge pull request #6 from Spa<tspan class="hard-br" rotate="45" dx=".1em" dy="-.2em">↓</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1292" class="output">ceghost/patch-1
</tspan><tspan xml:space="preserve" x="10" y="1310" class="output">
</tspan><tspan xml:space="preserve" x="10" y="1328" class="output"><tspan class="fg2"># Modify a file in this new change:</tspan>
@ -114,8 +114,8 @@
</tspan><tspan xml:space="preserve" x="10" y="1382" class="output">$ jj status
</tspan><tspan xml:space="preserve" x="10" y="1400" class="output">Working copy changes:
</tspan><tspan xml:space="preserve" x="10" y="1418" class="output"><tspan class="fg6">M README</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1436" class="output">Working copy : <tspan class="bold fg13">s</tspan><tspan class="bold fg8">ykquxrt</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">f</tspan><tspan class="bold fg8">3b4701e</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">(no description set)</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1454" class="output">Parent commit: <tspan class="bold fg5">o</tspan><tspan class="fg8">rrkosyo</tspan> <tspan class="bold fg4">7</tspan><tspan class="fg8">fd1a60b</tspan> <tspan class="fg5">master</tspan><tspan class="fg8"> | </tspan><tspan class="fg2">(empty)</tspan> Merge pull request #6 from Spa<tspan class="hard-br" rotate="45" dx=".1em" dy="-.2em">↓</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1436" class="output">Working copy : <tspan class="bold fg13">q</tspan><tspan class="bold fg8">ulnmsro</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">5</tspan><tspan class="bold fg8">1e8e98e</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">(no description set)</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1454" class="output">Parent commit: <tspan class="bold fg5">or</tspan><tspan class="fg8">rkosyo</tspan> <tspan class="bold fg4">7</tspan><tspan class="fg8">fd1a60b</tspan> <tspan class="fg5">master</tspan><tspan class="fg8"> | </tspan><tspan class="fg2">(empty)</tspan> Merge pull request #6 from Spa<tspan class="hard-br" rotate="45" dx=".1em" dy="-.2em">↓</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1472" class="output">ceghost/patch-1
</tspan><tspan xml:space="preserve" x="10" y="1490" class="output">
</tspan><tspan xml:space="preserve" x="10" y="1508" class="output"><tspan class="fg2"># The working copy is not special; we can, for</tspan>
@ -123,25 +123,22 @@
</tspan><tspan xml:space="preserve" x="10" y="1544" class="output"><tspan class="fg2"># First, set it on the working copy:</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1562" class="output">
</tspan><tspan xml:space="preserve" x="10" y="1580" class="output">$ jj describe -m everyone
</tspan><tspan xml:space="preserve" x="10" y="1598" class="output">Working copy now at: <tspan class="bold fg13">s</tspan><tspan class="bold fg8">ykquxrt</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">9</tspan><tspan class="bold fg8">3d83772</tspan><tspan class="bold"> everyone</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1616" class="output">Parent commit      : <tspan class="bold fg5">o</tspan><tspan class="fg8">rrkosyo</tspan> <tspan class="bold fg4">7</tspan><tspan class="fg8">fd1a60b</tspan> <tspan class="fg5">master</tspan><tspan class="fg8"> | </tspan><tspan class="fg2">(empty)</tspan> Merge pull request #6 fr<tspan class="hard-br" rotate="45" dx=".1em" dy="-.2em">↓</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1634" class="output">om Spaceghost/patch-1
</tspan><tspan xml:space="preserve" x="10" y="1652" class="output"><tspan class="fg8">... (output redacted) ...</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1670" class="output">
</tspan><tspan xml:space="preserve" x="10" y="1688" class="output"><tspan class="fg2"># Now set it on the change we worked on before:</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1706" class="output">
</tspan><tspan xml:space="preserve" x="10" y="1724" class="output">$ jj describe goodbye -m goodbye
</tspan><tspan xml:space="preserve" x="10" y="1742" class="output">
</tspan><tspan xml:space="preserve" x="10" y="1760" class="output"><tspan class="fg2"># Inspect the result:</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1778" class="output">
</tspan><tspan xml:space="preserve" x="10" y="1796" class="output">$ jj log
</tspan><tspan xml:space="preserve" x="10" y="1814" class="output">○  <tspan class="bold fg5">t</tspan><tspan class="fg8">tmypqzs</tspan> <tspan class="fg3">jjfan@example.com</tspan> <tspan class="fg6">2024-09-04 19:21:14</tspan> <tspan class="fg5">goodbye</tspan> <tspan class="bold fg4">1</tspan><tspan class="fg8">3c5fc55</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1832" class="output">│  goodbye
</tspan><tspan xml:space="preserve" x="10" y="1850" class="output">│ <tspan class="bold fg2">@</tspan>  <tspan class="bold fg13">s</tspan><tspan class="bold fg8">ykquxrt</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">jjfan@example.com</tspan><tspan class="bold"> </tspan><tspan class="bold fg14">2024-09-04 19:21:14</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">9</tspan><tspan class="bold fg8">3d83772</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1868" class="output">├─╯  <tspan class="bold">everyone</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1886" class="output"><tspan class="bold fg14">◆</tspan>  <tspan class="bold fg5">o</tspan><tspan class="fg8">rrkosyo</tspan> <tspan class="fg3">octocat@nowhere.com</tspan> <tspan class="fg6">2012-03-06 16:06:50</tspan> <tspan class="fg5">master</tspan> <tspan class="bold fg4">7</tspan><tspan class="fg8">fd1a60b</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1904" class="output">│  <tspan class="fg2">(empty)</tspan> Merge pull request #6 from Spaceghost/patch-1
</tspan><tspan xml:space="preserve" x="10" y="1922" class="output">~
</tspan><tspan xml:space="preserve" x="10" y="1598" class="output"><tspan class="fg8">... (output redacted) ...</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1616" class="output">
</tspan><tspan xml:space="preserve" x="10" y="1634" class="output"><tspan class="fg2"># Now set it on the change we worked on before:</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1652" class="output">
</tspan><tspan xml:space="preserve" x="10" y="1670" class="output">$ jj describe goodbye -m goodbye
</tspan><tspan xml:space="preserve" x="10" y="1688" class="output">
</tspan><tspan xml:space="preserve" x="10" y="1706" class="output"><tspan class="fg2"># Inspect the result:</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1724" class="output">
</tspan><tspan xml:space="preserve" x="10" y="1742" class="output">$ jj log
</tspan><tspan xml:space="preserve" x="10" y="1760" class="output">○  <tspan class="bold fg5">oz</tspan><tspan class="fg8">smopnz</tspan> <tspan class="fg3">jjfan@example.com</tspan> <tspan class="fg6">2024-09-05 17:44:52</tspan> <tspan class="fg5">goodbye</tspan> <tspan class="bold fg4">e</tspan><tspan class="fg8">b4cc65d</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1778" class="output">│  goodbye
</tspan><tspan xml:space="preserve" x="10" y="1796" class="output">│ <tspan class="bold fg2">@</tspan>  <tspan class="bold fg13">q</tspan><tspan class="bold fg8">ulnmsro</tspan><tspan class="bold"> </tspan><tspan class="bold fg3">jjfan@example.com</tspan><tspan class="bold"> </tspan><tspan class="bold fg14">2024-09-05 17:44:52</tspan><tspan class="bold"> </tspan><tspan class="bold fg12">a</tspan><tspan class="bold fg8">a8ad947</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1814" class="output">├─╯  <tspan class="bold">everyone</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1832" class="output"><tspan class="bold fg14">◆</tspan>  <tspan class="bold fg5">or</tspan><tspan class="fg8">rkosyo</tspan> <tspan class="fg3">octocat@nowhere.com</tspan> <tspan class="fg6">2012-03-06 16:06:50</tspan> <tspan class="fg5">master</tspan> <tspan class="bold fg4">7</tspan><tspan class="fg8">fd1a60b</tspan>
</tspan><tspan xml:space="preserve" x="10" y="1850" class="output">│  <tspan class="fg2">(empty)</tspan> Merge pull request #6 from Spaceghost/patch-1
</tspan><tspan xml:space="preserve" x="10" y="1868" class="output">~
</tspan></text>
</svg>
</svg>

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 20 KiB

After

Width:  |  Height:  |  Size: 19 KiB