summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean Whitton <spwhitton@spwhitton.name>2022-10-16 15:10:44 -0700
committerSean Whitton <spwhitton@spwhitton.name>2022-10-18 12:40:47 -0700
commitde5e6bed742ac7167eaf93c685e95470d26f9ed7 (patch)
tree1dec6ae7e2fe0367f55639fa969075da8d6d3d8e
parent2cf90567d9d9ae50f8bb0d788bba2d1bf60a3b6c (diff)
downloaddotfiles-de5e6bed742ac7167eaf93c685e95470d26f9ed7.tar.gz
separate myrepos registrations for each Emacs worktree
-rw-r--r--.mrconfig.in29
1 files changed, 21 insertions, 8 deletions
diff --git a/.mrconfig.in b/.mrconfig.in
index a8c726b0..7b973724 100644
--- a/.mrconfig.in
+++ b/.mrconfig.in
@@ -531,14 +531,6 @@ post_checkout =
git remote add -f debian https://salsa.debian.org/rlb/deb-emacs.git/
on spwhitton@melete && git checkout -b melete demeter/melete
./autogen.sh all
- if workstation; then
- git worktree add -b athena/unstable \
- "$HOME/src/emacs-snapshot" demeter/athena/unstable
- git worktree add -b deb/emacs/d/sid/master \
- "$HOME/src/emacs-dfsg" debian/deb/emacs/d/sid/master
- git worktree add -b deb/emacs-non-dfsg/d/sid/master \
- "$HOME/src/emacs-non-dfsg" debian/deb/emacs-non-dfsg/d/sid/master
- fi
fixups =
git rev-parse melete@{upstream} >/dev/null 2>&1 \
&& git branch --unset-upstream melete
@@ -563,6 +555,27 @@ pull = git checkout melete \
&& git push -f demeter melete
skip = lazy || [ "$1" = pull ] && ! on spwhitton@melete
+# myrepos git_status assumes a separate registration for each worktree.
+# Empty update action to prevent fetching from remotes over and over again.
+
+[src/emacs-snapshot]
+checkout = git -C "$HOME/src/emacs" worktree add -b athena/unstable \
+ "$HOME/src/emacs-snapshot" demeter/athena/unstable
+update = :
+skip = ! workstation || ! [ -d "$HOME/src/emacs" ]
+
+[src/emacs-dfsg]
+checkout = git -C "$HOME/src/emacs" worktree add -b deb/emacs/d/sid/master \
+ "$HOME/src/emacs-dfsg" debian/deb/emacs/d/sid/master
+update = :
+skip = ! workstation || ! [ -d "$HOME/src/emacs" ]
+
+[src/emacs-non-dfsg]
+checkout = git -C "$HOME/src/emacs" worktree add -b deb/emacs-non-dfsg/d/sid/master \
+ "$HOME/src/emacs-non-dfsg" debian/deb/emacs-non-dfsg/d/sid/master
+update = :
+skip = ! workstation || ! [ -d "$HOME/src/emacs" ]
+
[src/elpa]
checkout = git clone https://git.savannah.gnu.org/git/emacs/elpa.git elpa
post_checkout = cd elpa && make setup