I am too a Computer Science student and currently working with Infosys. I appreciate your effort in open source and hope you will keep that up..

Usage: smartmake.py [-f] ['find' parseable timestamp (optional)]
Must have a .smartmake config file present in .hg/ containing
[smartmake]
objdir: your-objdir/
cmd: make -C (or equivalent make command)

Does this mean it’s difficult to use if you have more than one objdir?

- C-x r is a prefix command for register and bookmark commands, , so I don’t want to override it for kill-hg-reject. Instead, giving C-c r a prefix argument invokes kill-hg-reject.

- kill-hg-reject not only kills the buffer visiting the .rej file, but also closes windows displaying that buffer. If C-c r popped up a window to show the reject file, then C-u C-c r will restore the frame to showing only the patched file.

(defun switch-hg-reject (kill-reject)
“Switch between a .rej file and the file it applies to.
With a prefix argument, kill the buffer visiting the reject file.”
(interactive “P”)
(unless (buffer-file-name)
(error “Buffer is not visiting any file”))
(if kill-reject
(kill-hg-reject)
(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))
(save-selected-window
(find-file-other-window other-file)))))

(defun kill-hg-reject ()
(interactive)
(let* ((reject-file
(if (string-match “\\.rej$” (buffer-file-name))
(buffer-file-name)
(concat (buffer-file-name) “.rej”)))
(buf (find-buffer-visiting reject-file)))
(unless buf
(error “Not visiting reject file: %s” reject-file))
(delete-windows-on buf)
(kill-buffer buf)))

(global-set-key (kbd “C-c r”) ‘switch-hg-reject)

That way, I get the reject and the original open in separate buffers, and don’t have to worry about the current working directory.

I’ll have to try yours/jimb’s. They seem like they may be more betterer, at least if you added in the “jump to site of first conflict” thing.

(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))
    (save-selected-window
      (find-file-other-window other-file))))

(defun kill-hg-reject ()
  (interactive)
  (let ((reject-file (concat (buffer-file-name) ".rej")))
    (let ((buf (find-buffer-visiting reject-file)))
      (if buf (kill-buffer buf)
        (message "Not visiting reject file: %s" reject-file)))))

(global-set-key (kbd "C-c r") 'switch-hg-reject)
(global-set-key (kbd "C-x r") 'kill-hg-reject)

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)))