[elpa] externals/eev 74356e4828: Rewrote some sections of (find-git-intro).

[ELPA Syncer]

branch: externals/eev
commit 74356e4828a4e3145fd033b4ebd8a4eece769680
Author: Eduardo Ochs <eduardoochs@gmail.com>
Commit: Eduardo Ochs <eduardoochs@gmail.com>

    Rewrote some sections of (find-git-intro).
---
 ChangeLog    |   1 +
 VERSION      |   4 +--
 eev-intro.el | 100 +++++++++++++++++++++++++++++++++++++++++++----------------
 3 files changed, 77 insertions(+), 28 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e4eab22749..438a392341 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@
 
        * eev-intro.el (ee-bol-skip-invisible, ee-eol-skip-invisible):
        fixed some typos.
+       (find-git-intro): several changes.
 
 2024-01-03  Eduardo Ochs  <eduardoochs@gmail.com>
 
diff --git a/VERSION b/VERSION
index 41326ccf0e..2b2439c6cc 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
-Thu Jan  4 12:33:25 GMT 2024
-Thu Jan  4 09:33:25 -03 2024
+Thu Jan  4 15:51:37 GMT 2024
+Thu Jan  4 12:51:37 -03 2024
diff --git a/eev-intro.el b/eev-intro.el
index ea4804ac68..8ada5ee5f8 100644
--- a/eev-intro.el
+++ b/eev-intro.el
@@ -628,6 +628,14 @@ explained here:
   (find-refining-intro \"2. Refining hyperlinks\")
 
 
+  UPDATE
+  See this:
+    (find-kl-here-intro)
+  for a way of generating \"hyperlinks to here\" that is usually
+  much more practical than `find-here-links'. NOTE: it was
+  implemented in dec/2023 and is still experimental!
+
+
 
 
 4.2. `find-ekey-links' and friends
@@ -3981,6 +3989,7 @@ This buffer is _temporary_ and _editable_.
 It is meant as both a tutorial and a sandbox.
 
 
+
 Note: this intro is being rewritten!
 I wrote it originally for this workshop:
   http://anggtwu.net/2021-workshop.html
@@ -3992,6 +4001,12 @@ _with subtitles_ the videos are very good.
 
 
 
+UPDATE (jan/2024):
+Please start by this:
+  (find-kl-here-intro)
+
+
+
 1. Saving interesting links
 ===========================
 Start by this video:
@@ -14228,11 +14243,11 @@ Check that you have bash, git and gitk installed. 
Then run this:
   cd       $S/http/anggtwu.net/LATEX/
   wget -N  'http://anggtwu.net/LATEX/2023loeliger.pdf'
   echo     'http://anggtwu.net/LATEX/2023loeliger.pdf' >> ~/.psne.log
-  mkdir -p $S/http/anggtwu.net/bin/
-  cd       $S/http/anggtwu.net/bin/
-  wget -N  'http://anggtwu.net/bin/eevgitlib1.sh'
-  echo     'http://anggtwu.net/bin/eevgitlib1.sh' >> ~/.psne.log
-  cp -v    $S/http/anggtwu.net/bin/eevgitlib1.sh /tmp/
+  mkdir -p $S/http/anggtwu.net/GIT/
+  cd       $S/http/anggtwu.net/GIT/
+  wget -N  'http://anggtwu.net/GIT/eevgitlib1.sh'
+  echo     'http://anggtwu.net/GIT/eevgitlib1.sh' >> ~/.psne.log
+  cp -v    $S/http/anggtwu.net/GIT/eevgitlib1.sh /tmp/
 
 This will download local copies of this flipbook animation,
 
@@ -14246,6 +14261,14 @@ test blocks. The \"-N\" tells wget to update the local 
copy if
 the upstream one is never, and the cp at the end copies
 eevgitlib1.sh to /tmp/.
 
+We also need a way to point to anchors in eevgitlib1.sh using
+short hyperlinks. Run this:
+
+  (code-c-d \"eevgit\" \"$S/http/anggtwu.net/GIT/\" :anchor)
+  ;; (find-eevgitfile \"eevgitlib1.sh\")
+
+
+
 
 
 2. A first test
@@ -14287,7 +14310,7 @@ this program:
 Note that the eepitch block above is similar to the one in this
 test block:
 
-  (find-anchor \"/tmp/eevgitlib1.sh\" \"MakeTree1-test\")
+  (find-eevgit \"eevgitlib1.sh\" \"MakeTree1-test\")
 
 
 
@@ -14296,7 +14319,7 @@ test block:
 ============
 Now try this test block:
 
-  (find-anchor \"/tmp/eevgitlib1.sh\" \"Time-tests\")
+  (find-eevgit \"eevgitlib1.sh\" \"Time-tests\")
 
 It runs the same git commands as the test in the previous
 section, except that it has lots of commands like \"T C3\"
@@ -14328,7 +14351,7 @@ This eepitch block
   rm -Rfv /tmp/eevgit-test2/
   mkdir   /tmp/eevgit-test2/
   cd      /tmp/eevgit-test2/
-  cp -av $S/http/anggtwu.net/bin/eevgitlib1.sh /tmp/
+  cp -av $S/http/anggtwu.net/GIT/eevgitlib1.sh /tmp/
   .       /tmp/eevgitlib1.sh
 
   git init
@@ -14382,36 +14405,61 @@ in contact! =)
 
 
 
-5. Pushing, pulling, merging
-============================
-Apparently this could be a test for pushing:
+6. Pushing and pulling
+======================
+A typical use case for git is like this: there is a \"shared\"
+git repository in a \"server\", and there are several
+\"developers\", each on a different machine, who are working on
+copies of the \"shared\" repository, and who are trying to
+somehow synchronize their work. The eepitch block below simulates
+that in a single machine:
 
  (eepitch-bash)
  (eepitch-kill)
  (eepitch-bash)
-  cp -av $S/http/anggtwu.net/bin/eevgitlib1.sh /tmp/
-  .       /tmp/eevgitlib1.sh
 
-  rm -Rfv /tmp/eevgit-test2/
-  mkdir   /tmp/eevgit-test2/
-  cd      /tmp/eevgit-test2/
+  # Load the functions in eevgitlib1.sh
+  cp -av $S/http/anggtwu.net/GIT/eevgitlib1.sh /tmp/
+  .         /tmp/eevgitlib1.sh
 
-  git init
+  # Create a \"shared\" repository in /tmp/eevgit-repo-s/
+  rm -Rfv   /tmp/eevgit-repo-s/
+  mkdir     /tmp/eevgit-repo-s/
+  cd        /tmp/eevgit-repo-s/
+  git init --bare
+
+  # Create a first \"developer\" repository in /tmp/eevgit-repo-1/
+  rm -Rfv   /tmp/eevgit-repo-1/
+  mkdir     /tmp/eevgit-repo-1/
+  cd        /tmp/eevgit-repo-1/
+  git clone /tmp/eevgit-repo-s/ .
+
+  # The developer 1 creates the commits A and B and pushes them
   Modify file1; git add file1; Commit A
   Modify file1;                Commit B
+  git push
 
-  rm -Rfv /tmp/eevgit-test3/
-  mkdir   /tmp/eevgit-test3/
-  cd      /tmp/eevgit-test3/
-  git clone /tmp/eevgit-test2/ .
+  # Create a second \"developer\" repository in /tmp/eevgit-repo-2/
+  rm -Rfv   /tmp/eevgit-repo-2/
+  mkdir     /tmp/eevgit-repo-2/
+  cd        /tmp/eevgit-repo-2/
+  git clone /tmp/eevgit-repo-s/ .
 
-  Modify file1
-  Commit C
+  # The developer 2 creates the commit C and pushes it
+  Modify file1;                Commit C
   git push
-  # (find-gitk \"/tmp/eevgit-test3/\")
 
-...but the \"git push\" at the end yields an error.
-I'll try to fix that soon!
+  # The developer 1 pulls the commit C
+  cd        /tmp/eevgit-repo-1/
+  git pull
+
+TODO: explain how to do some of the operations above with magit
+instead of with low-level git commands!
+
+  # (find-gitk \"/tmp/eevgit-repo1/\")
+  # (find-gitk \"/tmp/eevgit-repo2/\")
+  # (find-gitk \"/tmp/eevgit-repo3/\")
+