diff options
Diffstat (limited to 'lib-src/mr/config')
| -rw-r--r-- | lib-src/mr/config | 63 |
1 files changed, 34 insertions, 29 deletions
diff --git a/lib-src/mr/config b/lib-src/mr/config index fd2519cb..3bfe55f7 100644 --- a/lib-src/mr/config +++ b/lib-src/mr/config @@ -449,36 +449,31 @@ post_checkout = install-git-hooks pandoc-citeproc-preamble skip = lazy -# 'master' branch: just for installing changes to upstream master +# "master" branch: just for installing changes to upstream master # -# 'melete' branch: +# "$(hostname -s)" branch: # # Rebased onto sv.gnu.org's master branch. It has # -# - patch(es) to integrate these development builds with my Debian -# workstation setup, just enough that I can use these builds day-to-day; -# these assume a sufficiently recent emacs-snapshot package from demeter -# is installed, to provide /usr/share/emacs-snapshot/site-lisp/elpa -# # - bug fixes, reversions etc., (cleaned up versions of) which have not # yet made it onto sv.gnu.org's master, but which are required for my -# own usage +# own usage, on this machine or in general # # - WIP patches of my own -- this branch is used for my own development # work, at least where that doesn't require long-lived feature branches. # # A key advantage of using these development builds is that references to # files in *Help* buffers will be to ~/src/emacs, not to somewhere owned by -# root. The branch is named after my laptop at the time I first set it up. +# root. # -# 'athena/unstable' branch: +# "athena/unstable" branch: # # Merges from sv.gnu.org's master branch only. .deb packages produced from # this branch are available from <http://silentflame.com/debian>. There are # two purposes: # # - providing byte-compiled Lisp /usr/share/emacs-snapshot/site-lisp/elpa -# to builds from the 'melete' branch +# to builds from the "$(hostname -s)" branch # # - direct use on machines other than my development laptop where I want # something more current than the stable release of Emacs but not with @@ -486,7 +481,7 @@ skip = lazy # # Updated only when new fixes, features or reversions on sv.gnu.org's # master branch are wanted on machines other than my development laptop. -# To do that, first 'melete' is updated using 'mr pull', and then I run +# To do that, first "melete" is updated using "mr pull", and then I run # that build for a day or so. Then # # % cd ~/src/emacs-snapshot @@ -511,10 +506,10 @@ skip = lazy # # It is important to test local installability of the new .deb, probably # in develacc or a sid chroot, before adding to demeter-apt, because -# running the rebased 'melete' branch doesn't detect any byte compilation +# running the rebased "melete" branch doesn't detect any byte compilation # issues against my current selection of elpa-* packages. # -# 'athena/CODENAME-bpo' branch: +# "athena/CODENAME-bpo" branch: # # Backported from athena/unstable. Automatically updated by # reprepro-rebuilder when updating athena/unstable as described above. @@ -527,31 +522,41 @@ post_checkout = cd emacs git remote add -f demeter demeter:emacs git remote add -f debian https://salsa.debian.org/rlb/deb-emacs.git/ - on spwhitton@melete && git checkout -b melete demeter/melete + # We might want a branch for localhost on non-workstations, but we only + # automatically create one on workstations. + if workstation; then + if [ -n "$(git for-each-ref '[r]efs/remotes/demeter/'$hostname)" ]; then + git checkout -b "$hostname" demeter/"$hostname" --no-track + else + git checkout -b "$hostname" --no-track + fi + fi ./autogen.sh all fixups = - git rev-parse melete@{upstream} >/dev/null 2>&1 \ - && git branch --unset-upstream melete + git rev-parse "$hostname"@{upstream} >/dev/null 2>&1 \ + && git branch --unset-upstream "$hostname" git config branch.master.rebase true - git config branch.melete.rebase true - git config branch.melete.pushRemote demeter + git config branch."$hostname".rebase true + # Set push remote in case we do need to make a backup of localhost's branch. + git config branch."$hostname".pushRemote demeter git config --replace-all remote.demeter.push ":" "^:$" - git config --replace-all remote.demeter.push "+melete:melete" "^\+melete:melete$" + git config --replace-all remote.demeter.push \ + "+${hostname}:${hostname}" "^\+${hostname}:${hostname}$" git config branch.deb/emacs/d/sid/master.dpmUpstreamBranch deb/emacs/d/sid/upstream git config branch.deb/emacs/d/sid/master.dpmPatchedBranch deb/emacs/d/sid/patched git config branch.deb/emacs-non-dfsg/d/sid/master.dpmUpstreamBranch \ deb/emacs-non-dfsg/d/sid/upstream git config branch.deb/emacs-non-dfsg/d/sid/master.dpmPatchedBranch \ deb/emacs-non-dfsg/d/sid/patched -# We don't have the melete branch's upstream set to origin/master to avoid -# accidentally pushing personal commits to Savannah (push.default cannot help -# here). So for convenient updates of melete to its conceptual upstream, we -# have this definition. "pull" not "update" because we want to update from -# upstream master deliberately, not as part of automated updates. -pull = git checkout melete \ - && git pull --rebase --autostash origin master \ - && git push -f demeter melete -skip = lazy || [ "$1" = pull ] && ! on spwhitton@melete +# We don't have the "$(hostname -s)" branch's upstream set to origin/master to +# avoid accidentally pushing personal commits to Savannah (push.default cannot +# help here). So for convenient updates of "$(hostname -s)" to its conceptual +# upstream, we have this definition. "pull" not "update" because we want to +# update from upstream master deliberately, not as part of automated updates. +pull = git checkout "$hostname" \ + && git pull --rebase --autostash origin master +skip = lazy || [ "$1" = pull ] \ + && [ -z "$(git for-each-ref '[r]efs/heads/'$hostname)" ] # myrepos git_status assumes a separate registration for each worktree. # Empty update action to prevent fetching from remotes over and over again. |