diff options
Diffstat (limited to 'lib-src/mr/config')
| -rw-r--r-- | lib-src/mr/config | 56 |
1 files changed, 29 insertions, 27 deletions
diff --git a/lib-src/mr/config b/lib-src/mr/config index 6e43ee0e..72600ec6 100644 --- a/lib-src/mr/config +++ b/lib-src/mr/config @@ -187,7 +187,7 @@ autoci = pre_update = mr autoci [src/athpriv] -checkout = git clone demeterp:athpriv +checkout = git clone spwp:athpriv pre_update = on athena || git annex sync origin athenah pre_push = on athena || git annex sync --content origin athenah post_update = hstow restow ~/src/athpriv @@ -214,7 +214,7 @@ fixups = #################################################################### [doc] -checkout = git clone demeterp:doc doc +checkout = git clone spwp:doc doc update = git pull --rebase=false --no-edit "$@" autoci = doccheckin pre_update = win32 || doccheckin @@ -225,17 +225,17 @@ post_checkout = git utime skip = ! mine [src/wiki] -checkout = git clone demeter:wiki +checkout = git clone spw:wiki skip = ! mine [lib/realloc] -checkout = git clone demeterp:realloc +checkout = git clone spwp:realloc skip = ! mine #################################################################### [lib/radicale] -checkout = git clone demeterp:radicale radicale +checkout = git clone spwp:radicale radicale skip = ! on spwhitton@athena [public_html] @@ -266,26 +266,28 @@ push = git annex sync --content cloud origin skip = lazy [lib/wikiannex] -checkout = git clone demeter:wikiannex +# legacy url for the origin remote +checkout = git clone git@git.spwhitton.name:wikiannex post_checkout = cd wikiannex; git annex init update = git annex sync --no-content push = git annex sync --content -fixups = ! on demeter || git annex adjust --hide-missing --unlock +fixups = ! on leto || git annex adjust --hide-missing --unlock skip = lazy [lib/podcasts] -checkout = git clone demeterp:podcasts +checkout = git clone spwp:podcasts post_checkout = cd podcasts; git annex init update = ./update-and-sync push = git annex --no-content sync skip = lazy -[lib/athena-apt] -checkout = git clone demeter:athena-apt +[lib/athenet-apt] +# legacy url for the origin remote +checkout = git clone git@git.spwhitton.name:athena-apt athenet-apt post_checkout = - cd athena-apt + cd athenet-apt git annex init --version=7 - git annex enableremote demeter rsyncurl=demeter:/srv/www/debian + git annex enableremote htdocs rsyncurl=silentflame.com:/srv/www/debian git annex get . update = git annex sync --no-content skip = lazy @@ -293,10 +295,10 @@ skip = lazy push = git annex add git annex unlock db - git annex sync --content demeter + git annex sync --content htdocs git annex sync origin - ssh demeter find /srv/www/debian -type f -exec chmod 644 '{}' + - ssh demeter find /srv/www/debian -type d -exec chmod 755 '{}' + + ssh silentflame.com find /srv/www/debian -type f -exec chmod 644 '{}' + + ssh silentflame.com find /srv/www/debian -type d -exec chmod 755 '{}' + # The git-diff-files(1) call in ~/src/dotfiles/bin/git-is-clean fails in v7 # git-annex repos with unlocked empty files, which this repo often has: empty @@ -332,9 +334,9 @@ isclean = # This branch doesn't usually need to be pushed anywhere, but if we do # need to push it somewhere for backup purposes, we execute # -# % git config branch."$(hostname -s)".pushRemote demeter +# % git config branch."$(hostname -s)".pushRemote spwhitton # -# and then 'mr push' will force push it to demeter. +# and then 'mr push' will force push it to git.spwhitton.name. # # "athena/unstable" branch: # @@ -356,7 +358,7 @@ isclean = # # % cd ~/src/deb/emacs-snapshot # % debian/merge-snapshot -# % dgit sbuild --no-run-lintian +# % dgit sbuild # % cp ../emacs-snapshot_29~git202*amd64.deb<TAB> ~/local/develacc/tmp # % sudo virsh start develacc.melete.silentflame.com # % cd /ssh:root@develacc:/home/spwhitton/tmp @@ -374,10 +376,10 @@ isclean = # # If need to back out before reprepro-rebuilder: # % cd ~//src/deb/emacs-snapshot -# % git reset --hard demeter/athena/unstable +# % git reset --hard spwhitton/athena/unstable # # It is important to test local installability of the new .deb, probably -# in develacc or a sid chroot, before adding to demeter-apt, because +# in develacc or a sid chroot, before adding to athenet-apt, because # running the rebased "melete" branch doesn't detect any byte compilation # issues against my current selection of elpa-* packages. # @@ -394,7 +396,7 @@ checkout = git clone https://git.savannah.gnu.org/git/emacs.git trunk post_clean = ./autogen.sh autoconf post_checkout = cd trunk - git remote add -f demeter demeter:emacs ||: + git remote add -f spwhitton spw:emacs ||: git -c fetch.fsckObjects=false \ remote add -f debian https://salsa.debian.org/rlb/deb-emacs.git/ ||: ./autogen.sh all @@ -405,8 +407,8 @@ skip = lazy checkout = git_worktree_checkout "$HOME/src/emacs/trunk" \ -b "$hostname" --no-track \ "$(if [ -n "$(git -C $HOME/src/emacs/trunk \ - for-each-ref '[r]efs/remotes/demeter/'"$hostname")" ] - then echo demeter/"$hostname"; else echo master; fi)" + for-each-ref '[r]efs/remotes/spwhitton/'"$hostname")" ] + then echo spwhitton/"$hostname"; else echo master; fi)" post_clean = ./autogen.sh autoconf post_checkout = cd primary; ./autogen.sh autoconf # We don't have the "$(hostname -s)" branch's upstream set to origin/master to @@ -438,7 +440,7 @@ skip = lazy || git_worktree_skip [src/deb/emacs-snapshot] checkout = git_worktree_checkout "$HOME/src/emacs/trunk" \ - -b athena/unstable demeter/athena/unstable + -b athena/unstable spwhitton/athena/unstable skip = ! workstation || git_worktree_skip [src/deb/emacs] @@ -478,12 +480,12 @@ skip = lazy checkout = git clone salsa:dgit-team/dgit post_checkout = cd dgit - git remote add -f demeter demeter:dgit ||: + git remote add -f spwhitton spw:dgit ||: dgit setup-new-tree skip = lazy [src/p5-Git-Annex] -checkout = git clone demeter:p5-Git-Annex +checkout = git clone spw:p5-Git-Annex post_checkout = cd p5-Git-Annex git remote \ @@ -492,7 +494,7 @@ post_checkout = skip = lazy [src/p5-API-GitForge] -checkout = git clone demeter:p5-API-GitForge +checkout = git clone spw:p5-API-GitForge post_checkout = cd p5-API-GitForge git remote \ |