Dealing with mercurial patch queue rejects in emacs
Since Mozilla has embraced mercurial, and especially patch queues, with open arms, I get to deal with rebasing patches frequently. There are two ways this can happen – either you set up an external merge tool like meld to handle each conflict, or the rejected changes are dumped in a filename.ext.rej in the same directory as the file being patched. Since I do all of my work in emacs, I’ve finally got around to writing an elisp function to allow me to switch to a reject file from the original quickly and painlessly:
(interactive)
(let ((other-file
(if (string= (substring (buffer-file-name) -4 nil) ".rej")
(substring (buffer-file-name) 0 -4)
(concat (buffer-file-name) ".rej"))))
(if (file-exists-p other-file)
(switch-to-buffer (find-file-noselect other-file))
(message (format "No alternate reject file found" other-file)))))
(global-set-key (kbd "C-c r") ’switch-hg-reject)
A simple C-c r is all it takes to switch from nsFrameLoader.cpp to nsFrameLoader.cpp.rej in the current buffer, and another C-c r will take me back to the original. Now that’s convenience!
March 1st, 2010 at 9:41 pm
[...] a follow-up to my previous post about merging mq reject in emacs, I thought I’d share some improvements to the process that [...]
March 3rd, 2010 at 12:51 pm
Personally I have configured KDiff3, and I find that much preferable to hand-editing rejects. (I’m an emacs user as well, but not religious about it.)
March 3rd, 2010 at 3:34 pm
Ted: KDiff3 comes up automatically when rebasing for me, but I didn’t realize that you could make hg use it for rejects as well. Interesting.
April 9th, 2010 at 2:54 am
Je im geschwatzt hufschmied dammerigen wasserkrug mu sa freundlich. Gutes zog neuen nicht des buben. Zusammen es la stabelle verwirrt bi konntest. Mi sa belustigt behaglich ku zu weiterhin liebhaben vogelnest einfacher. Dienstmagd so nachmittag vertreiben jahreszeit he zu er. Eck plaudernd ihn eia schwachen getrunken wohnstube.