diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2022-05-22 15:41:00 -0700 |
|---|---|---|
| committer | Sean Whitton <spwhitton@spwhitton.name> | 2022-05-22 15:41:18 -0700 |
| commit | 5eaaa08a8a6847cfb29de9fcd664f122713377a7 (patch) | |
| tree | 8ef9fca8a2200ac79142f88bd8bb1710dc45dc1b | |
| parent | 934b78260f587b892d6bfe32909733c179cfc3ef (diff) | |
| download | dotfiles-5eaaa08a8a6847cfb29de9fcd664f122713377a7.tar.gz | |
nmbug-spw -> notmuch-git
| -rw-r--r-- | .mrconfig.in | 20 | ||||
| -rw-r--r-- | .notmuch-config | 4 | ||||
| -rwxr-xr-x | bin/nmbug-spw | 3 |
3 files changed, 14 insertions, 13 deletions
diff --git a/.mrconfig.in b/.mrconfig.in index cf2cd17e..269d259f 100644 --- a/.mrconfig.in +++ b/.mrconfig.in @@ -747,18 +747,18 @@ checkout = git clone demeterp:realloc realloc skip = ! mine [lib/nmbug-spw] -checkout = nmbug-spw clone demeterp:nmbug-spw -update = nmbug-spw pull -push = nmbug-spw push -sync = mr autoci; nmbug-spw pull && nmbug-spw push +checkout = notmuch git clone demeterp:nmbug-spw +update = notmuch git pull +push = notmuch git push +sync = mr autoci; notmuch git pull && notmuch git push status = - nmbug-spw status | grep -v "^U\s" || true + notmuch git status | grep -v "^U\s" || true # `nmbug status` does not catch committed but unpushed changes git --no-pager log --branches \ --not --remotes \ --simplify-by-decoration --decorate --oneline -log = nmbug-spw log -commit = nmbug-spw commit +log = notmuch git log +commit = notmuch git commit # Should be safe to commit a small number of local changes. We're # trying to avoid: # - wiping out git because db contains no spw:: tags (`nmbug @@ -766,13 +766,13 @@ commit = nmbug-spw commit # - doing any committing when there are known remote changes. # # TODO (Script to) periodically drop old spw::killed tags from repo. This -# should speed up nmbug-spw runs on athena. Might need to adjust autoci, +# should speed up 'notmuch git' runs on athena. Might need to adjust autoci, # however, as dropping the tags might mean there are less than 500 tags left, # in which case the current check would not protect us from wiping out git # when `nmbug checkout` is needed. autoci = - nmbug-spw status | perl -ne'/^[AD][ad]?\s/ and $i++ > 500 and exit 1' \ - && nmbug-spw commit + notmuch git status | perl -ne'/^[AD][ad]?\s/ and $i++ > 500 and exit 1' \ + && notmuch git commit skip = ! [ -e "$HOME/local/auth/fmailsyncpass" ] # --- my personal documents. Override my global update command back diff --git a/.notmuch-config b/.notmuch-config index 60cd2e3f..ed8d03b0 100644 --- a/.notmuch-config +++ b/.notmuch-config @@ -105,3 +105,7 @@ header.Team=X-Distro-Tracker-Team # If this has to become any more complex I might move this file ->athpriv.git. bulk=sexp:"(List *)" or from:rss2email@athena.silentflame.com or from:gmi2email@athena.silentflame.com or to:ftpmaster@debian.org or to:ftpmaster@ftp-master.debian.org or to:cron@ftp-master.debian.org inbox=(to:spwhitton@spwhitton.name or to:spwhitton@email.arizona.edu or to:"Sean Whitton" or not query:bulk or List:".xt.local>" or List:".list-id.mcsv.net") and not (folder:sent or folder:/^annex/sent-/ or folder:drafts or folder:notes or from:"WSJ Editors" or from:"LWN.net Weekly notification") + +[git] +tag_prefix=spw:: +path=/home/spwhitton/lib/nmbug-spw/ diff --git a/bin/nmbug-spw b/bin/nmbug-spw deleted file mode 100755 index ebd73fbe..00000000 --- a/bin/nmbug-spw +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -NMBGIT="$HOME/lib/nmbug-spw" NMBPREFIX="spw::" nmbug "$@" |