botjagwar VS los-opinionated-git-tools

As a Wikimedian who used to spend sleepless nights editing on the Malagasy language Wikipedia and Wiktionary, I have been developing botjagwar (https://github.com/radomd92/botjagwar) on and off for the last 10 years. More details at https://github.com/radomd92/botjagwar/wiki/Backstory

It's mostly bot scripts written in Python. Data is stored in a self-hosted PostgreSQL. In addition to a backend I'd written myself, I also use PostgREST. and a with a rather rustic front-end was written in 2020 (https://github.com/radomd92/botjagwar-frontend) as a COVID lockdown side-project. Other scripts also use Redis as a page cache to speed up operation involving a large number of page reads.

A bunch of shell scripts I've written over the years are available from https://git.marcofontani.it/mfontani/scripts

Very useful ones:

- evenodd, to colorize the background of lines of text so it's easier to see which start of text corresponds to which end of text

- time-rollup, to time the time it takes to run a given command and provide percentage-based statistics on the execution

- a wrapper around "jq" to make it DWIM w/regards to gzipped, bzipped, and zstd-compressed files

I've also put some full-fledged binaries on github:

- https://github.com/mfontani/prettycrontab which is a crontab pretty-printer which parses a possibly specially commented crontab to give you an overview of what's coming up next

- https://github.com/mfontani/tstdin to timestamp your stdin, and provide when the line was received, how long it was since the start of the command, and how long it was since the last line was received. Useful to add at the end of a pipe to both log and perform analysis on the output and time it took to do stuff

- https://github.com/mfontani/rofixec to "sorta template" a rofi (a X11 runner) runner so it picks commands from a given list (provided as yaml or json configuration) and executes the picked item in a background job

- https://github.com/mfontani/git-recent which helps you pick the most recent branches you've worked on, very useful when paired with fzf for picking

- https://github.com/mfontani/los-opinionated-git-tools instead contains a ton of useful little git-related scripts, from one which DWIMs the master/main/blead branch name to one which helps you reauthor the last commit, to one (git-rr) which helps you perform a git rebase with context info about the commits you're rebasing: which files they touched, etc - to make it easier to fixup together commits which touched the same file... which is an operation I do so often I've created a "git-fixup" script, which automates fixing up the currently committed file to the last commit which touched that file in the branch

I've had to deal with projects where the "main" branch was named: master, main, blead.

I almost never "name" that "main" branch, thanks to commands and aliases.

When I want to pull (and rebase) to the "main" branch, I run "git prom". When I want to check out the "main" branch, I "git com". What actually happens depends on what the project's "main" branch is. If a project later moves to a "live" branch, I'll just update the "git-main" script to detect it ahead of the rest, and off I go.

https://github.com/mfontani/los-opinionated-git-tools/blob/m... is less than ten lines of bash.

git-com is really just: git checkout "$(git main)"

git-prom is really just: git pull --rebase origin "$(git main)"

I'm not particularly sold on "main" vs "master" being an important thing, but if it's important to some I at least want to ensure I don't get frustrated when interacting with a project which uses it. With the above aliases and functions and programs, I don't care anymore.

main, master, blead... call it whatever.