Comments on: Dealing with mercurial patch queue rejects in emacs http://www.joshmatthews.net/blog/2010/01/dealing-with-mercurial-patch-queue-rejects-in-emacs/ /* You are not expected to understand this */ Sat, 04 Feb 2012 03:50:26 +0000 hourly 1 http://wordpress.org/?v=3.3.1 By: Jim Blandy http://www.joshmatthews.net/blog/2010/01/dealing-with-mercurial-patch-queue-rejects-in-emacs/comment-page-1/#comment-16489 Jim Blandy Fri, 27 Jan 2012 17:46:58 +0000 http://www.joshmatthews.net/blog/2010/01/dealing-with-mercurial-patch-queue-rejects-in-emacs/#comment-16489 This behaved surprisingly for me when I switched to a file I was sure I was visiting with C-x b, and then hit C-c r: I wasn't actually visiting the file, and switch-hg-reject wasn't prepared for a buffer in which buffer-file-name returns nil. Also, if you run this in a buffer whose filename is less than four characters long, I think there might be problems. If the file being switched to doesn't exist, then that should be an error, not just a message; errors abort keyboard macros and have other useful behaviors. Finally, I think it's nice to check for errors with 'unless', so that the post-error-check code isn't indented. Here's my current version: (defun switch-hg-reject () (interactive) (unless (buffer-file-name) (error "Buffer is not visiting any file")) (let ((other-file (if (string-match "\\.rej$" (buffer-file-name)) (substring (buffer-file-name) 0 (match-beginning 0)) (concat (buffer-file-name) ".rej")))) (unless (file-exists-p other-file) (error "Reject/original file not found: %s" other-file)) (find-file other-file))) This behaved surprisingly for me when I switched to a file I was sure I was visiting with C-x b, and then hit C-c r: I wasn’t actually visiting the file, and switch-hg-reject wasn’t prepared for a buffer in which buffer-file-name returns nil.

Also, if you run this in a buffer whose filename is less than four characters long, I think there might be problems.

If the file being switched to doesn’t exist, then that should be an error, not just a message; errors abort keyboard macros and have other useful behaviors.

Finally, I think it’s nice to check for errors with ‘unless’, so that the post-error-check code isn’t indented.

Here’s my current version:

(defun switch-hg-reject ()
(interactive)
(unless (buffer-file-name)
(error “Buffer is not visiting any file”))
(let ((other-file
(if (string-match “\\.rej$” (buffer-file-name))
(substring (buffer-file-name) 0 (match-beginning 0))
(concat (buffer-file-name) “.rej”))))
(unless (file-exists-p other-file)
(error “Reject/original file not found: %s” other-file))
(find-file other-file)))

]]> By: Jim Blandy http://www.joshmatthews.net/blog/2010/01/dealing-with-mercurial-patch-queue-rejects-in-emacs/comment-page-1/#comment-16398 Jim Blandy Wed, 25 Jan 2012 17:07:40 +0000 http://www.joshmatthews.net/blog/2010/01/dealing-with-mercurial-patch-queue-rejects-in-emacs/#comment-16398 Wonderful! It seems like mercurial queues should treat patch rejects like merge conflicts, but short of that, this seems quite helpful. Wonderful! It seems like mercurial queues should treat patch rejects like merge conflicts, but short of that, this seems quite helpful.

]]> By: Ravid http://www.joshmatthews.net/blog/2010/01/dealing-with-mercurial-patch-queue-rejects-in-emacs/comment-page-1/#comment-428 Ravid Fri, 09 Apr 2010 06:54:47 +0000 http://www.joshmatthews.net/blog/2010/01/dealing-with-mercurial-patch-queue-rejects-in-emacs/#comment-428 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. 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.

]]> By: Josh Matthews http://www.joshmatthews.net/blog/2010/01/dealing-with-mercurial-patch-queue-rejects-in-emacs/comment-page-1/#comment-285 Josh Matthews Wed, 03 Mar 2010 19:34:55 +0000 http://www.joshmatthews.net/blog/2010/01/dealing-with-mercurial-patch-queue-rejects-in-emacs/#comment-285 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. 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.

]]> By: Ted Mielczarek http://www.joshmatthews.net/blog/2010/01/dealing-with-mercurial-patch-queue-rejects-in-emacs/comment-page-1/#comment-284 Ted Mielczarek Wed, 03 Mar 2010 16:51:25 +0000 http://www.joshmatthews.net/blog/2010/01/dealing-with-mercurial-patch-queue-rejects-in-emacs/#comment-284 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.) 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.)

]]> By: Faster mercurial patch queue merging with emacs | Dysfunctional Programming http://www.joshmatthews.net/blog/2010/01/dealing-with-mercurial-patch-queue-rejects-in-emacs/comment-page-1/#comment-277 Faster mercurial patch queue merging with emacs | Dysfunctional Programming Tue, 02 Mar 2010 01:41:09 +0000 http://www.joshmatthews.net/blog/2010/01/dealing-with-mercurial-patch-queue-rejects-in-emacs/#comment-277 [...] a follow-up to my previous post about merging mq reject in emacs, I thought I’d share some improvements to the process that [...] [...] a follow-up to my previous post about merging mq reject in emacs, I thought I’d share some improvements to the process that [...]

]]>