diff options
| -rw-r--r-- | .emacs.d/init.el | 2 | ||||
| -rw-r--r-- | .mrconfig.in | 28 | ||||
| -rwxr-xr-x | bin/doccheckin | 4 |
3 files changed, 28 insertions, 6 deletions
diff --git a/.emacs.d/init.el b/.emacs.d/init.el index f8e329ed..5e0696f5 100644 --- a/.emacs.d/init.el +++ b/.emacs.d/init.el @@ -212,7 +212,7 @@ windows side-by-side in the frame." '(gnus-extra-headers '(To Cc List-Id)) '(gnus-gcc-mark-as-read t) '(gnus-interactive-exit 'quiet) - '(gnus-kill-files-directory "~/doc/News/") + '(gnus-kill-files-directory "~/src/athpriv/News/") '(gnus-kill-summary-on-exit t nil nil "Would prefer nil but t seems advisable for notmuch groups.") '(gnus-large-ephemeral-newsgroup 8000) '(gnus-large-newsgroup 8000) diff --git a/.mrconfig.in b/.mrconfig.in index 5b4c3e6c..eb6010de 100644 --- a/.mrconfig.in +++ b/.mrconfig.in @@ -299,9 +299,33 @@ post_stow = load-trustdb [src/athpriv] checkout = git clone demeterp:athpriv athpriv +pre_update = on athena || git annex sync origin athenah +pre_push = on athena || git annex sync --content origin athenah stowable = true skip = ! mine +post_checkout = + cd athpriv + git annex init + on athena || git remote add athenah athenah:src/athpriv + git annex group . backup + +fixups = + git config remote.origin.annex-ignore true + git config unpushed-tags.ignore true + git config annex.addunlocked true + git config annex.synconlyannex true + + # TODO Use git-annex-whereused to systematically drop old News/*. + git config mrrepo.review-unused false + +# We also ran: +# % git annex config --set annex.largefiles "include=*.SCORE or include=*.ADAPT" + +autoci = + git annex add News/* + git commit News -m"auto commit of Gnus score files" + # since priv repo also stows into ~/.duply, make the dir first pre_stow = homedir_mkdirs @@ -749,10 +773,10 @@ post_checkout = git utime # before pulling, automatically commit in the same way that my cron job does pre_update = win32 || doccheckin # ... and let me do it manually -autoci = doccheckin --full || true +autoci = doccheckin || true # quick syncs -sync = doccheckin --full && git pull --no-edit && git push +sync = doccheckin && git pull --no-edit && git push # --- static websites on web host boxes diff --git a/bin/doccheckin b/bin/doccheckin index 985cf6cc..92afe12b 100755 --- a/bin/doccheckin +++ b/bin/doccheckin @@ -23,7 +23,5 @@ git add howm/*.org howm/*/*.org archive/howm/archive.org \ emacs-diary archive/emacs-diary-* \ || true -[ "$1" = "--full" ] && git add News/* ||: - # this command should never fail and stop mr -git commit -m "auto commit on $(hostname -s)" || true +git commit -a -m "auto commit on $(hostname -s)" || true |