eglot2emacs

README.md

This code merges eglot.el from joaotavora/eglot to upstream emacs.git master branch. It does below:

• Move eglot.el to lisp/progmodes/eglot.el
• Preserve complete history from original repo for the file
• Edit commit messages to append URLs for all mentioned issues and PRs to individual commit message

Dependencies required

• https://github.com/newren/git-filter-repo (nix shell nixpkgs#git-filter-repo)
• git

While made by order, it is perfect example and suitable to rearrange code while preserving as well as modifying git history programmatically.

Hope it helps!

eglot2emacs.py

for match in re.finditer(b"([ ,\(]|Fix|github)#[0-9]+", message):
    message = b''.join([message, b'\n', match.group(0).strip(), b': https://github.com/joaotavora/eglot/issues/', re.sub(b"[^0123456789]", b"", match.group(0))])

return message

eglot2emacs.sh

# move to a directory where both repos can be cloned
cd ~/git

# TODO: Save eglot2emacs.py here

# clone repos
git clone https://github.com/joaotavora/eglot.git
git clone -b master git://git.sv.gnu.org/emacs.git

# filter eglot with only eglot.el
# move eglot.el to lisp/progmodes/eglot.el -> This makes history file specific and everything makes
# find+replace # in commit messages
cd eglot
git filter-repo --to-subdirectory-filter lisp/progmodes/ --path eglot.el --message-callback ../eglot2emacs.py
 
# back to emacs repo
cd ../emacs

# add filtered eglot as upstream
git remote add eglot ../eglot/
git fetch eglot master

# prepare emacs repo for merge
git merge remotes/eglot/master --allow-unrelated-histories --no-commit

# make a commit
git commit -m "; Merge from joaotavora/eglot"