contrib/mq.el
author Bryan O'Sullivan <bos@serpentine.com>
Tue, 08 May 2007 11:54:39 -0700
changeset 4424 1d31302c4522
parent 4423 2647f1fbc24c
child 4425 a57ac6049e22
permissions -rw-r--r--
mq.el: add mq-diff function.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
3007
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
     1
;;; mq.el --- Emacs support for Mercurial Queues
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
     2
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
     3
;; Copyright (C) 2006 Bryan O'Sullivan
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
     4
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
     5
;; Author: Bryan O'Sullivan <bos@serpentine.com>
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
     6
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
     7
;; mq.el is free software; you can redistribute it and/or modify it
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
     8
;; under the terms of version 2 of the GNU General Public License as
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
     9
;; published by the Free Software Foundation.
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
    10
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
    11
;; mq.el is distributed in the hope that it will be useful, but
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
    12
;; WITHOUT ANY WARRANTY; without even the implied warranty of
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
    13
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
    14
;; General Public License for more details.
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
    15
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
    16
;; You should have received a copy of the GNU General Public License
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
    17
;; along with mq.el, GNU Emacs, or XEmacs; see the file COPYING (`C-h
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
    18
;; C-l').  If not, write to the Free Software Foundation, Inc., 59
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
    19
;; Temple Place - Suite 330, Boston, MA 02111-1307, USA.
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
    20
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
    21
(require 'mercurial)
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
    22
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
    23

425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
    24
(defcustom mq-mode-hook nil
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
    25
  "Hook run when a buffer enters mq-mode."
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
    26
  :type 'sexp
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
    27
  :group 'mercurial)
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
    28
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
    29
(defcustom mq-global-prefix "\C-cq"
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
    30
  "The global prefix for Mercurial Queues keymap bindings."
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
    31
  :type 'sexp
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
    32
  :group 'mercurial)
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
    33
3009
e2bad806ccc3 mq.el: add ability to edit a patch.
Bryan O'Sullivan <bos@serpentine.com>
parents: 3007
diff changeset
    34
(defcustom mq-edit-mode-hook nil
e2bad806ccc3 mq.el: add ability to edit a patch.
Bryan O'Sullivan <bos@serpentine.com>
parents: 3007
diff changeset
    35
  "Hook run after a buffer is populated to edit a patch description."
e2bad806ccc3 mq.el: add ability to edit a patch.
Bryan O'Sullivan <bos@serpentine.com>
parents: 3007
diff changeset
    36
  :type 'sexp
e2bad806ccc3 mq.el: add ability to edit a patch.
Bryan O'Sullivan <bos@serpentine.com>
parents: 3007
diff changeset
    37
  :group 'mercurial)
e2bad806ccc3 mq.el: add ability to edit a patch.
Bryan O'Sullivan <bos@serpentine.com>
parents: 3007
diff changeset
    38
3007
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
    39

425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
    40
;;; Internal variables.
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
    41
3370
b7fe334ff4fb mq.el: add mode-line hook
Brendan Cully <brendan@kublai.com>
parents: 3010
diff changeset
    42
(defvar mq-mode nil
b7fe334ff4fb mq.el: add mode-line hook
Brendan Cully <brendan@kublai.com>
parents: 3010
diff changeset
    43
  "Is this file managed by MQ?")
b7fe334ff4fb mq.el: add mode-line hook
Brendan Cully <brendan@kublai.com>
parents: 3010
diff changeset
    44
(make-variable-buffer-local 'mq-mode)
b7fe334ff4fb mq.el: add mode-line hook
Brendan Cully <brendan@kublai.com>
parents: 3010
diff changeset
    45
(put 'mq-mode 'permanent-local t)
b7fe334ff4fb mq.el: add mode-line hook
Brendan Cully <brendan@kublai.com>
parents: 3010
diff changeset
    46
3007
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
    47
(defvar mq-patch-history nil)
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
    48
3370
b7fe334ff4fb mq.el: add mode-line hook
Brendan Cully <brendan@kublai.com>
parents: 3010
diff changeset
    49
(defvar mq-top-patch '(nil))
b7fe334ff4fb mq.el: add mode-line hook
Brendan Cully <brendan@kublai.com>
parents: 3010
diff changeset
    50
3009
e2bad806ccc3 mq.el: add ability to edit a patch.
Bryan O'Sullivan <bos@serpentine.com>
parents: 3007
diff changeset
    51
(defvar mq-prev-buffer nil)
e2bad806ccc3 mq.el: add ability to edit a patch.
Bryan O'Sullivan <bos@serpentine.com>
parents: 3007
diff changeset
    52
(make-variable-buffer-local 'mq-prev-buffer)
e2bad806ccc3 mq.el: add ability to edit a patch.
Bryan O'Sullivan <bos@serpentine.com>
parents: 3007
diff changeset
    53
(put 'mq-prev-buffer 'permanent-local t)
e2bad806ccc3 mq.el: add ability to edit a patch.
Bryan O'Sullivan <bos@serpentine.com>
parents: 3007
diff changeset
    54
3007
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
    55

425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
    56
;;; Global keymap.
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
    57
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
    58
(defvar mq-global-map (make-sparse-keymap))
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
    59
(fset 'mq-global-map mq-global-map)
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
    60
(global-set-key mq-global-prefix 'mq-global-map)
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
    61
(define-key mq-global-map "." 'mq-push)
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
    62
(define-key mq-global-map ">" 'mq-push-all)
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
    63
(define-key mq-global-map "," 'mq-pop)
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
    64
(define-key mq-global-map "<" 'mq-pop-all)
4424
1d31302c4522 mq.el: add mq-diff function.
Bryan O'Sullivan <bos@serpentine.com>
parents: 4423
diff changeset
    65
(define-key mq-global-map "=" 'mq-diff)
3007
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
    66
(define-key mq-global-map "r" 'mq-refresh)
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
    67
(define-key mq-global-map "e" 'mq-refresh-edit)
4422
7b0d0acea6d6 mq.el: add mq-new function.
Bryan O'Sullivan <bos@serpentine.com>
parents: 3370
diff changeset
    68
(define-key mq-global-map "i" 'mq-new)
3007
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
    69
(define-key mq-global-map "n" 'mq-next)
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
    70
(define-key mq-global-map "p" 'mq-previous)
4423
2647f1fbc24c mq.el: add mq-edit-series function.
Bryan O'Sullivan <bos@serpentine.com>
parents: 4422
diff changeset
    71
(define-key mq-global-map "s" 'mq-edit-series)
3007
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
    72
(define-key mq-global-map "t" 'mq-top)
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
    73
3370
b7fe334ff4fb mq.el: add mode-line hook
Brendan Cully <brendan@kublai.com>
parents: 3010
diff changeset
    74
(add-minor-mode 'mq-mode 'mq-mode)
b7fe334ff4fb mq.el: add mode-line hook
Brendan Cully <brendan@kublai.com>
parents: 3010
diff changeset
    75
3007
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
    76

3009
e2bad806ccc3 mq.el: add ability to edit a patch.
Bryan O'Sullivan <bos@serpentine.com>
parents: 3007
diff changeset
    77
;;; Refresh edit mode keymap.
e2bad806ccc3 mq.el: add ability to edit a patch.
Bryan O'Sullivan <bos@serpentine.com>
parents: 3007
diff changeset
    78
e2bad806ccc3 mq.el: add ability to edit a patch.
Bryan O'Sullivan <bos@serpentine.com>
parents: 3007
diff changeset
    79
(defvar mq-edit-mode-map (make-sparse-keymap))
e2bad806ccc3 mq.el: add ability to edit a patch.
Bryan O'Sullivan <bos@serpentine.com>
parents: 3007
diff changeset
    80
(define-key mq-edit-mode-map "\C-c\C-c" 'mq-edit-finish)
e2bad806ccc3 mq.el: add ability to edit a patch.
Bryan O'Sullivan <bos@serpentine.com>
parents: 3007
diff changeset
    81
(define-key mq-edit-mode-map "\C-c\C-k" 'mq-edit-kill)
e2bad806ccc3 mq.el: add ability to edit a patch.
Bryan O'Sullivan <bos@serpentine.com>
parents: 3007
diff changeset
    82
e2bad806ccc3 mq.el: add ability to edit a patch.
Bryan O'Sullivan <bos@serpentine.com>
parents: 3007
diff changeset
    83

3007
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
    84
;;; Helper functions.
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
    85
4422
7b0d0acea6d6 mq.el: add mq-new function.
Bryan O'Sullivan <bos@serpentine.com>
parents: 3370
diff changeset
    86
(defun mq-read-patch-name (&optional source prompt force)
3007
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
    87
  "Read a patch name to use with a command.
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
    88
May return nil, meaning \"use the default\"."
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
    89
  (let ((patches (split-string
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
    90
		  (hg-chomp (hg-run0 (or source "qseries"))) "\n")))
4422
7b0d0acea6d6 mq.el: add mq-new function.
Bryan O'Sullivan <bos@serpentine.com>
parents: 3370
diff changeset
    91
    (when force
3007
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
    92
      (completing-read (format "Patch%s: " (or prompt ""))
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
    93
		       (map 'list 'cons patches patches)
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
    94
		       nil
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
    95
		       nil
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
    96
		       nil
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
    97
		       'mq-patch-history))))
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
    98
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
    99
(defun mq-refresh-buffers (root)
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
   100
  (save-excursion
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
   101
    (dolist (buf (hg-buffers-visiting-repo root))
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
   102
      (when (not (verify-visited-file-modtime buf))
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
   103
	(set-buffer buf)
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
   104
	(let ((ctx (hg-buffer-context)))
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
   105
	  (message "Refreshing %s..." (buffer-name))
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
   106
	  (revert-buffer t t t)
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
   107
	  (hg-restore-context ctx)
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
   108
	  (message "Refreshing %s...done" (buffer-name))))))
3370
b7fe334ff4fb mq.el: add mode-line hook
Brendan Cully <brendan@kublai.com>
parents: 3010
diff changeset
   109
  (hg-update-mode-lines root)
b7fe334ff4fb mq.el: add mode-line hook
Brendan Cully <brendan@kublai.com>
parents: 3010
diff changeset
   110
  (mq-update-mode-lines root))
3007
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
   111
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
   112
(defun mq-last-line ()
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
   113
  (goto-char (point-max))
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
   114
  (beginning-of-line)
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
   115
  (when (looking-at "^$")
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
   116
    (forward-line -1))
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
   117
  (let ((bol (point)))
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
   118
    (end-of-line)
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
   119
    (let ((line (buffer-substring bol (point))))
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
   120
      (when (> (length line) 0)
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
   121
	line))))
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
   122
  
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
   123
(defun mq-push (&optional patch)
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
   124
  "Push patches until PATCH is reached.
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
   125
If PATCH is nil, push at most one patch."
4422
7b0d0acea6d6 mq.el: add mq-new function.
Bryan O'Sullivan <bos@serpentine.com>
parents: 3370
diff changeset
   126
  (interactive (list (mq-read-patch-name "qunapplied" " to push"
7b0d0acea6d6 mq.el: add mq-new function.
Bryan O'Sullivan <bos@serpentine.com>
parents: 3370
diff changeset
   127
					 current-prefix-arg)))
3007
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
   128
  (let ((root (hg-root))
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
   129
	(prev-buf (current-buffer))
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
   130
	last-line ok)
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
   131
    (unless root
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
   132
      (error "Cannot push outside a repository!"))
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
   133
    (hg-sync-buffers root)
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
   134
    (let ((buf-name (format "MQ: Push %s" (or patch "next patch"))))
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
   135
      (kill-buffer (get-buffer-create buf-name))
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
   136
      (split-window-vertically)
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
   137
      (other-window 1)
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
   138
      (switch-to-buffer (get-buffer-create buf-name))
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
   139
      (cd root)
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
   140
      (message "Pushing...")
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
   141
      (setq ok (= 0 (apply 'call-process (hg-binary) nil t t "qpush"
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
   142
			   (if patch (list patch))))
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
   143
	    last-line (mq-last-line))
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
   144
      (let ((lines (count-lines (point-min) (point-max))))
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
   145
	(if (and (equal lines 2) (string-match "Now at:" last-line))
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
   146
	    (progn
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
   147
	      (kill-buffer (current-buffer))
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
   148
	      (delete-window))
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
   149
	  (hg-view-mode prev-buf))))
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
   150
    (mq-refresh-buffers root)
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
   151
    (sit-for 0)
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
   152
    (when last-line
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
   153
      (if ok
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
   154
	  (message "Pushing... %s" last-line)
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
   155
	(error "Pushing... %s" last-line)))))
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
   156
  
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
   157
(defun mq-push-all ()
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
   158
  "Push patches until all are applied."
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
   159
  (interactive)
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
   160
  (mq-push "-a"))
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
   161
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
   162
(defun mq-pop (&optional patch)
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
   163
  "Pop patches until PATCH is reached.
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
   164
If PATCH is nil, pop at most one patch."
4422
7b0d0acea6d6 mq.el: add mq-new function.
Bryan O'Sullivan <bos@serpentine.com>
parents: 3370
diff changeset
   165
  (interactive (list (mq-read-patch-name "qapplied" " to pop to"
7b0d0acea6d6 mq.el: add mq-new function.
Bryan O'Sullivan <bos@serpentine.com>
parents: 3370
diff changeset
   166
					 current-prefix-arg)))
3007
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
   167
  (let ((root (hg-root))
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
   168
	last-line ok)
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
   169
    (unless root
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
   170
      (error "Cannot pop outside a repository!"))
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
   171
    (hg-sync-buffers root)
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
   172
    (set-buffer (generate-new-buffer "qpop"))
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
   173
    (cd root)
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
   174
    (message "Popping...")
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
   175
    (setq ok (= 0 (apply 'call-process (hg-binary) nil t t "qpop"
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
   176
			 (if patch (list patch))))
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
   177
	  last-line (mq-last-line))
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
   178
    (kill-buffer (current-buffer))
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
   179
    (mq-refresh-buffers root)
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
   180
    (sit-for 0)
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
   181
    (when last-line
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
   182
      (if ok
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
   183
	  (message "Popping... %s" last-line)
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
   184
	(error "Popping... %s" last-line)))))
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
   185
  
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
   186
(defun mq-pop-all ()
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
   187
  "Push patches until none are applied."
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
   188
  (interactive)
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
   189
  (mq-pop "-a"))
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
   190
3009
e2bad806ccc3 mq.el: add ability to edit a patch.
Bryan O'Sullivan <bos@serpentine.com>
parents: 3007
diff changeset
   191
(defun mq-refresh-internal (root &rest args)
e2bad806ccc3 mq.el: add ability to edit a patch.
Bryan O'Sullivan <bos@serpentine.com>
parents: 3007
diff changeset
   192
  (hg-sync-buffers root)
e2bad806ccc3 mq.el: add ability to edit a patch.
Bryan O'Sullivan <bos@serpentine.com>
parents: 3007
diff changeset
   193
  (let ((patch (mq-patch-info "qtop")))
e2bad806ccc3 mq.el: add ability to edit a patch.
Bryan O'Sullivan <bos@serpentine.com>
parents: 3007
diff changeset
   194
    (message "Refreshing %s..." patch)
e2bad806ccc3 mq.el: add ability to edit a patch.
Bryan O'Sullivan <bos@serpentine.com>
parents: 3007
diff changeset
   195
    (let ((ret (apply 'hg-run "qrefresh" args)))
e2bad806ccc3 mq.el: add ability to edit a patch.
Bryan O'Sullivan <bos@serpentine.com>
parents: 3007
diff changeset
   196
      (if (equal (car ret) 0)
e2bad806ccc3 mq.el: add ability to edit a patch.
Bryan O'Sullivan <bos@serpentine.com>
parents: 3007
diff changeset
   197
	  (message "Refreshing %s... done." patch)
e2bad806ccc3 mq.el: add ability to edit a patch.
Bryan O'Sullivan <bos@serpentine.com>
parents: 3007
diff changeset
   198
	(error "Refreshing %s... %s" patch (hg-chomp (cdr ret)))))))
e2bad806ccc3 mq.el: add ability to edit a patch.
Bryan O'Sullivan <bos@serpentine.com>
parents: 3007
diff changeset
   199
3007
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
   200
(defun mq-refresh ()
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
   201
  "Refresh the topmost applied patch."
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
   202
  (interactive)
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
   203
  (let ((root (hg-root)))
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
   204
    (unless root
3009
e2bad806ccc3 mq.el: add ability to edit a patch.
Bryan O'Sullivan <bos@serpentine.com>
parents: 3007
diff changeset
   205
      (error "Cannot refresh outside of a repository!"))
e2bad806ccc3 mq.el: add ability to edit a patch.
Bryan O'Sullivan <bos@serpentine.com>
parents: 3007
diff changeset
   206
  (mq-refresh-internal root)))
3007
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
   207
3009
e2bad806ccc3 mq.el: add ability to edit a patch.
Bryan O'Sullivan <bos@serpentine.com>
parents: 3007
diff changeset
   208
(defun mq-patch-info (cmd &optional msg)
e2bad806ccc3 mq.el: add ability to edit a patch.
Bryan O'Sullivan <bos@serpentine.com>
parents: 3007
diff changeset
   209
  (let* ((ret (hg-run cmd))
e2bad806ccc3 mq.el: add ability to edit a patch.
Bryan O'Sullivan <bos@serpentine.com>
parents: 3007
diff changeset
   210
	 (info (hg-chomp (cdr ret))))
3007
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
   211
    (if (equal (car ret) 0)
3009
e2bad806ccc3 mq.el: add ability to edit a patch.
Bryan O'Sullivan <bos@serpentine.com>
parents: 3007
diff changeset
   212
	(if msg
e2bad806ccc3 mq.el: add ability to edit a patch.
Bryan O'Sullivan <bos@serpentine.com>
parents: 3007
diff changeset
   213
	    (message "%s patch: %s" msg info)
e2bad806ccc3 mq.el: add ability to edit a patch.
Bryan O'Sullivan <bos@serpentine.com>
parents: 3007
diff changeset
   214
	  info)
e2bad806ccc3 mq.el: add ability to edit a patch.
Bryan O'Sullivan <bos@serpentine.com>
parents: 3007
diff changeset
   215
      (error "%s" info))))
3007
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
   216
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
   217
(defun mq-top ()
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
   218
  "Print the name of the topmost applied patch."
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
   219
  (interactive)
3009
e2bad806ccc3 mq.el: add ability to edit a patch.
Bryan O'Sullivan <bos@serpentine.com>
parents: 3007
diff changeset
   220
  (mq-patch-info "qtop" "Top"))
3007
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
   221
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
   222
(defun mq-next ()
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
   223
  "Print the name of the next patch to be pushed."
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
   224
  (interactive)
3009
e2bad806ccc3 mq.el: add ability to edit a patch.
Bryan O'Sullivan <bos@serpentine.com>
parents: 3007
diff changeset
   225
  (mq-patch-info "qnext" "Next"))
3007
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
   226
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
   227
(defun mq-previous ()
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
   228
  "Print the name of the first patch below the topmost applied patch.
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
   229
This would become the active patch if popped to."
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
   230
  (interactive)
3009
e2bad806ccc3 mq.el: add ability to edit a patch.
Bryan O'Sullivan <bos@serpentine.com>
parents: 3007
diff changeset
   231
  (mq-patch-info "qprev" "Previous"))
3007
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
   232
3009
e2bad806ccc3 mq.el: add ability to edit a patch.
Bryan O'Sullivan <bos@serpentine.com>
parents: 3007
diff changeset
   233
(defun mq-edit-finish ()
3010
06696f9c30c0 mq.el: Add comment to mq-edit-finish.
Bryan O'Sullivan <bos@serpentine.com>
parents: 3009
diff changeset
   234
  "Finish editing the description of this patch, and refresh the patch."
3009
e2bad806ccc3 mq.el: add ability to edit a patch.
Bryan O'Sullivan <bos@serpentine.com>
parents: 3007
diff changeset
   235
  (interactive)
e2bad806ccc3 mq.el: add ability to edit a patch.
Bryan O'Sullivan <bos@serpentine.com>
parents: 3007
diff changeset
   236
  (unless (equal (mq-patch-info "qtop") mq-top)
e2bad806ccc3 mq.el: add ability to edit a patch.
Bryan O'Sullivan <bos@serpentine.com>
parents: 3007
diff changeset
   237
    (error "Topmost patch has changed!"))
e2bad806ccc3 mq.el: add ability to edit a patch.
Bryan O'Sullivan <bos@serpentine.com>
parents: 3007
diff changeset
   238
  (hg-sync-buffers hg-root)
e2bad806ccc3 mq.el: add ability to edit a patch.
Bryan O'Sullivan <bos@serpentine.com>
parents: 3007
diff changeset
   239
  (mq-refresh-internal hg-root "-m" (buffer-substring (point-min) (point-max)))
e2bad806ccc3 mq.el: add ability to edit a patch.
Bryan O'Sullivan <bos@serpentine.com>
parents: 3007
diff changeset
   240
  (let ((buf mq-prev-buffer))
e2bad806ccc3 mq.el: add ability to edit a patch.
Bryan O'Sullivan <bos@serpentine.com>
parents: 3007
diff changeset
   241
    (kill-buffer nil)
e2bad806ccc3 mq.el: add ability to edit a patch.
Bryan O'Sullivan <bos@serpentine.com>
parents: 3007
diff changeset
   242
    (switch-to-buffer buf)))
e2bad806ccc3 mq.el: add ability to edit a patch.
Bryan O'Sullivan <bos@serpentine.com>
parents: 3007
diff changeset
   243
  
e2bad806ccc3 mq.el: add ability to edit a patch.
Bryan O'Sullivan <bos@serpentine.com>
parents: 3007
diff changeset
   244
(defun mq-edit-kill ()
e2bad806ccc3 mq.el: add ability to edit a patch.
Bryan O'Sullivan <bos@serpentine.com>
parents: 3007
diff changeset
   245
  "Kill the edit currently being prepared."
e2bad806ccc3 mq.el: add ability to edit a patch.
Bryan O'Sullivan <bos@serpentine.com>
parents: 3007
diff changeset
   246
  (interactive)
e2bad806ccc3 mq.el: add ability to edit a patch.
Bryan O'Sullivan <bos@serpentine.com>
parents: 3007
diff changeset
   247
  (when (or (not (buffer-modified-p)) (y-or-n-p "Really kill this edit? "))
e2bad806ccc3 mq.el: add ability to edit a patch.
Bryan O'Sullivan <bos@serpentine.com>
parents: 3007
diff changeset
   248
    (let ((buf mq-prev-buffer))
e2bad806ccc3 mq.el: add ability to edit a patch.
Bryan O'Sullivan <bos@serpentine.com>
parents: 3007
diff changeset
   249
      (kill-buffer nil)
e2bad806ccc3 mq.el: add ability to edit a patch.
Bryan O'Sullivan <bos@serpentine.com>
parents: 3007
diff changeset
   250
      (switch-to-buffer buf))))
e2bad806ccc3 mq.el: add ability to edit a patch.
Bryan O'Sullivan <bos@serpentine.com>
parents: 3007
diff changeset
   251
3370
b7fe334ff4fb mq.el: add mode-line hook
Brendan Cully <brendan@kublai.com>
parents: 3010
diff changeset
   252
(defun mq-get-top (root)
b7fe334ff4fb mq.el: add mode-line hook
Brendan Cully <brendan@kublai.com>
parents: 3010
diff changeset
   253
  (let ((entry (assoc root mq-top-patch)))
b7fe334ff4fb mq.el: add mode-line hook
Brendan Cully <brendan@kublai.com>
parents: 3010
diff changeset
   254
    (if entry
b7fe334ff4fb mq.el: add mode-line hook
Brendan Cully <brendan@kublai.com>
parents: 3010
diff changeset
   255
        (cdr entry))))
b7fe334ff4fb mq.el: add mode-line hook
Brendan Cully <brendan@kublai.com>
parents: 3010
diff changeset
   256
b7fe334ff4fb mq.el: add mode-line hook
Brendan Cully <brendan@kublai.com>
parents: 3010
diff changeset
   257
(defun mq-set-top (root patch)
b7fe334ff4fb mq.el: add mode-line hook
Brendan Cully <brendan@kublai.com>
parents: 3010
diff changeset
   258
  (let ((entry (assoc root mq-top-patch)))
b7fe334ff4fb mq.el: add mode-line hook
Brendan Cully <brendan@kublai.com>
parents: 3010
diff changeset
   259
    (if entry
b7fe334ff4fb mq.el: add mode-line hook
Brendan Cully <brendan@kublai.com>
parents: 3010
diff changeset
   260
        (if patch
b7fe334ff4fb mq.el: add mode-line hook
Brendan Cully <brendan@kublai.com>
parents: 3010
diff changeset
   261
            (setcdr entry patch)
b7fe334ff4fb mq.el: add mode-line hook
Brendan Cully <brendan@kublai.com>
parents: 3010
diff changeset
   262
          (setq mq-top-patch (delq entry mq-top-patch)))
b7fe334ff4fb mq.el: add mode-line hook
Brendan Cully <brendan@kublai.com>
parents: 3010
diff changeset
   263
      (setq mq-top-patch (cons (cons root patch) mq-top-patch)))))
b7fe334ff4fb mq.el: add mode-line hook
Brendan Cully <brendan@kublai.com>
parents: 3010
diff changeset
   264
b7fe334ff4fb mq.el: add mode-line hook
Brendan Cully <brendan@kublai.com>
parents: 3010
diff changeset
   265
(defun mq-update-mode-lines (root)
b7fe334ff4fb mq.el: add mode-line hook
Brendan Cully <brendan@kublai.com>
parents: 3010
diff changeset
   266
  (let ((cwd default-directory))
b7fe334ff4fb mq.el: add mode-line hook
Brendan Cully <brendan@kublai.com>
parents: 3010
diff changeset
   267
    (cd root)
b7fe334ff4fb mq.el: add mode-line hook
Brendan Cully <brendan@kublai.com>
parents: 3010
diff changeset
   268
    (condition-case nil
b7fe334ff4fb mq.el: add mode-line hook
Brendan Cully <brendan@kublai.com>
parents: 3010
diff changeset
   269
        (mq-set-top root (mq-patch-info "qtop"))
b7fe334ff4fb mq.el: add mode-line hook
Brendan Cully <brendan@kublai.com>
parents: 3010
diff changeset
   270
      (error (mq-set-top root nil)))
b7fe334ff4fb mq.el: add mode-line hook
Brendan Cully <brendan@kublai.com>
parents: 3010
diff changeset
   271
    (cd cwd))
b7fe334ff4fb mq.el: add mode-line hook
Brendan Cully <brendan@kublai.com>
parents: 3010
diff changeset
   272
  (let ((patch (mq-get-top root)))
b7fe334ff4fb mq.el: add mode-line hook
Brendan Cully <brendan@kublai.com>
parents: 3010
diff changeset
   273
    (save-excursion
b7fe334ff4fb mq.el: add mode-line hook
Brendan Cully <brendan@kublai.com>
parents: 3010
diff changeset
   274
      (dolist (buf (hg-buffers-visiting-repo root))
b7fe334ff4fb mq.el: add mode-line hook
Brendan Cully <brendan@kublai.com>
parents: 3010
diff changeset
   275
        (set-buffer buf)
b7fe334ff4fb mq.el: add mode-line hook
Brendan Cully <brendan@kublai.com>
parents: 3010
diff changeset
   276
        (if mq-mode
b7fe334ff4fb mq.el: add mode-line hook
Brendan Cully <brendan@kublai.com>
parents: 3010
diff changeset
   277
            (setq mq-mode (or (and patch (concat " MQ:" patch)) " MQ")))))))
b7fe334ff4fb mq.el: add mode-line hook
Brendan Cully <brendan@kublai.com>
parents: 3010
diff changeset
   278
	
b7fe334ff4fb mq.el: add mode-line hook
Brendan Cully <brendan@kublai.com>
parents: 3010
diff changeset
   279
(defun mq-mode (&optional arg)
b7fe334ff4fb mq.el: add mode-line hook
Brendan Cully <brendan@kublai.com>
parents: 3010
diff changeset
   280
  "Minor mode for Mercurial repositories with an MQ patch queue"
b7fe334ff4fb mq.el: add mode-line hook
Brendan Cully <brendan@kublai.com>
parents: 3010
diff changeset
   281
  (interactive "i")
b7fe334ff4fb mq.el: add mode-line hook
Brendan Cully <brendan@kublai.com>
parents: 3010
diff changeset
   282
  (cond ((hg-root)
b7fe334ff4fb mq.el: add mode-line hook
Brendan Cully <brendan@kublai.com>
parents: 3010
diff changeset
   283
         (setq mq-mode (if (null arg) (not mq-mode)
b7fe334ff4fb mq.el: add mode-line hook
Brendan Cully <brendan@kublai.com>
parents: 3010
diff changeset
   284
                         arg))
b7fe334ff4fb mq.el: add mode-line hook
Brendan Cully <brendan@kublai.com>
parents: 3010
diff changeset
   285
         (mq-update-mode-lines (hg-root))))
b7fe334ff4fb mq.el: add mode-line hook
Brendan Cully <brendan@kublai.com>
parents: 3010
diff changeset
   286
  (run-hooks 'mq-mode-hook))
b7fe334ff4fb mq.el: add mode-line hook
Brendan Cully <brendan@kublai.com>
parents: 3010
diff changeset
   287
3009
e2bad806ccc3 mq.el: add ability to edit a patch.
Bryan O'Sullivan <bos@serpentine.com>
parents: 3007
diff changeset
   288
(defun mq-edit-mode ()
e2bad806ccc3 mq.el: add ability to edit a patch.
Bryan O'Sullivan <bos@serpentine.com>
parents: 3007
diff changeset
   289
  "Mode for editing the description of a patch.
e2bad806ccc3 mq.el: add ability to edit a patch.
Bryan O'Sullivan <bos@serpentine.com>
parents: 3007
diff changeset
   290
e2bad806ccc3 mq.el: add ability to edit a patch.
Bryan O'Sullivan <bos@serpentine.com>
parents: 3007
diff changeset
   291
Key bindings
e2bad806ccc3 mq.el: add ability to edit a patch.
Bryan O'Sullivan <bos@serpentine.com>
parents: 3007
diff changeset
   292
------------
e2bad806ccc3 mq.el: add ability to edit a patch.
Bryan O'Sullivan <bos@serpentine.com>
parents: 3007
diff changeset
   293
\\[mq-edit-finish]	use this description
e2bad806ccc3 mq.el: add ability to edit a patch.
Bryan O'Sullivan <bos@serpentine.com>
parents: 3007
diff changeset
   294
\\[mq-edit-kill]	abandon this description"
e2bad806ccc3 mq.el: add ability to edit a patch.
Bryan O'Sullivan <bos@serpentine.com>
parents: 3007
diff changeset
   295
  (interactive)
e2bad806ccc3 mq.el: add ability to edit a patch.
Bryan O'Sullivan <bos@serpentine.com>
parents: 3007
diff changeset
   296
  (use-local-map mq-edit-mode-map)
e2bad806ccc3 mq.el: add ability to edit a patch.
Bryan O'Sullivan <bos@serpentine.com>
parents: 3007
diff changeset
   297
  (set-syntax-table text-mode-syntax-table)
e2bad806ccc3 mq.el: add ability to edit a patch.
Bryan O'Sullivan <bos@serpentine.com>
parents: 3007
diff changeset
   298
  (setq local-abbrev-table text-mode-abbrev-table
e2bad806ccc3 mq.el: add ability to edit a patch.
Bryan O'Sullivan <bos@serpentine.com>
parents: 3007
diff changeset
   299
	major-mode 'mq-edit-mode
e2bad806ccc3 mq.el: add ability to edit a patch.
Bryan O'Sullivan <bos@serpentine.com>
parents: 3007
diff changeset
   300
	mode-name "MQ-Edit")
e2bad806ccc3 mq.el: add ability to edit a patch.
Bryan O'Sullivan <bos@serpentine.com>
parents: 3007
diff changeset
   301
  (set-buffer-modified-p nil)
e2bad806ccc3 mq.el: add ability to edit a patch.
Bryan O'Sullivan <bos@serpentine.com>
parents: 3007
diff changeset
   302
  (setq buffer-undo-list nil)
e2bad806ccc3 mq.el: add ability to edit a patch.
Bryan O'Sullivan <bos@serpentine.com>
parents: 3007
diff changeset
   303
  (run-hooks 'text-mode-hook 'mq-edit-mode-hook))
e2bad806ccc3 mq.el: add ability to edit a patch.
Bryan O'Sullivan <bos@serpentine.com>
parents: 3007
diff changeset
   304
  
3007
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
   305
(defun mq-refresh-edit ()
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
   306
  "Refresh the topmost applied patch, editing the patch description."
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
   307
  (interactive)
3009
e2bad806ccc3 mq.el: add ability to edit a patch.
Bryan O'Sullivan <bos@serpentine.com>
parents: 3007
diff changeset
   308
  (while mq-prev-buffer
e2bad806ccc3 mq.el: add ability to edit a patch.
Bryan O'Sullivan <bos@serpentine.com>
parents: 3007
diff changeset
   309
    (set-buffer mq-prev-buffer))
e2bad806ccc3 mq.el: add ability to edit a patch.
Bryan O'Sullivan <bos@serpentine.com>
parents: 3007
diff changeset
   310
  (let ((root (hg-root))
e2bad806ccc3 mq.el: add ability to edit a patch.
Bryan O'Sullivan <bos@serpentine.com>
parents: 3007
diff changeset
   311
	(prev-buffer (current-buffer))
e2bad806ccc3 mq.el: add ability to edit a patch.
Bryan O'Sullivan <bos@serpentine.com>
parents: 3007
diff changeset
   312
	(patch (mq-patch-info "qtop")))
e2bad806ccc3 mq.el: add ability to edit a patch.
Bryan O'Sullivan <bos@serpentine.com>
parents: 3007
diff changeset
   313
    (hg-sync-buffers root)
e2bad806ccc3 mq.el: add ability to edit a patch.
Bryan O'Sullivan <bos@serpentine.com>
parents: 3007
diff changeset
   314
    (let ((buf-name (format "*MQ: Edit description of %s*" patch)))
e2bad806ccc3 mq.el: add ability to edit a patch.
Bryan O'Sullivan <bos@serpentine.com>
parents: 3007
diff changeset
   315
      (switch-to-buffer (get-buffer-create buf-name))
e2bad806ccc3 mq.el: add ability to edit a patch.
Bryan O'Sullivan <bos@serpentine.com>
parents: 3007
diff changeset
   316
      (when (= (point-min) (point-max))
e2bad806ccc3 mq.el: add ability to edit a patch.
Bryan O'Sullivan <bos@serpentine.com>
parents: 3007
diff changeset
   317
	(set (make-local-variable 'hg-root) root)
e2bad806ccc3 mq.el: add ability to edit a patch.
Bryan O'Sullivan <bos@serpentine.com>
parents: 3007
diff changeset
   318
	(set (make-local-variable 'mq-top) patch)
e2bad806ccc3 mq.el: add ability to edit a patch.
Bryan O'Sullivan <bos@serpentine.com>
parents: 3007
diff changeset
   319
	(setq mq-prev-buffer prev-buffer)
e2bad806ccc3 mq.el: add ability to edit a patch.
Bryan O'Sullivan <bos@serpentine.com>
parents: 3007
diff changeset
   320
	(insert (hg-run0 "qheader"))
e2bad806ccc3 mq.el: add ability to edit a patch.
Bryan O'Sullivan <bos@serpentine.com>
parents: 3007
diff changeset
   321
	(goto-char (point-min)))
e2bad806ccc3 mq.el: add ability to edit a patch.
Bryan O'Sullivan <bos@serpentine.com>
parents: 3007
diff changeset
   322
      (mq-edit-mode)
e2bad806ccc3 mq.el: add ability to edit a patch.
Bryan O'Sullivan <bos@serpentine.com>
parents: 3007
diff changeset
   323
      (cd root)))
e2bad806ccc3 mq.el: add ability to edit a patch.
Bryan O'Sullivan <bos@serpentine.com>
parents: 3007
diff changeset
   324
  (message "Type `C-c C-c' to finish editing and refresh the patch."))
3007
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
   325
4422
7b0d0acea6d6 mq.el: add mq-new function.
Bryan O'Sullivan <bos@serpentine.com>
parents: 3370
diff changeset
   326
(defun mq-new (name)
7b0d0acea6d6 mq.el: add mq-new function.
Bryan O'Sullivan <bos@serpentine.com>
parents: 3370
diff changeset
   327
  "Create a new empty patch named NAME.
7b0d0acea6d6 mq.el: add mq-new function.
Bryan O'Sullivan <bos@serpentine.com>
parents: 3370
diff changeset
   328
The patch is applied on top of the current topmost patch.
7b0d0acea6d6 mq.el: add mq-new function.
Bryan O'Sullivan <bos@serpentine.com>
parents: 3370
diff changeset
   329
With a prefix argument, forcibly create the patch even if the working
7b0d0acea6d6 mq.el: add mq-new function.
Bryan O'Sullivan <bos@serpentine.com>
parents: 3370
diff changeset
   330
directory is modified."
7b0d0acea6d6 mq.el: add mq-new function.
Bryan O'Sullivan <bos@serpentine.com>
parents: 3370
diff changeset
   331
  (interactive (list (mq-read-patch-name "qseries" " to create" t)))
7b0d0acea6d6 mq.el: add mq-new function.
Bryan O'Sullivan <bos@serpentine.com>
parents: 3370
diff changeset
   332
  (message "Creating patch...")
7b0d0acea6d6 mq.el: add mq-new function.
Bryan O'Sullivan <bos@serpentine.com>
parents: 3370
diff changeset
   333
  (let ((ret (if current-prefix-arg
7b0d0acea6d6 mq.el: add mq-new function.
Bryan O'Sullivan <bos@serpentine.com>
parents: 3370
diff changeset
   334
		 (hg-run "qnew" "-f" name)
7b0d0acea6d6 mq.el: add mq-new function.
Bryan O'Sullivan <bos@serpentine.com>
parents: 3370
diff changeset
   335
	       (hg-run "qnew" name))))
7b0d0acea6d6 mq.el: add mq-new function.
Bryan O'Sullivan <bos@serpentine.com>
parents: 3370
diff changeset
   336
    (if (equal (car ret) 0)
7b0d0acea6d6 mq.el: add mq-new function.
Bryan O'Sullivan <bos@serpentine.com>
parents: 3370
diff changeset
   337
	(progn
7b0d0acea6d6 mq.el: add mq-new function.
Bryan O'Sullivan <bos@serpentine.com>
parents: 3370
diff changeset
   338
	  (hg-update-mode-lines (buffer-file-name))
7b0d0acea6d6 mq.el: add mq-new function.
Bryan O'Sullivan <bos@serpentine.com>
parents: 3370
diff changeset
   339
	  (message "Creating patch... done."))
7b0d0acea6d6 mq.el: add mq-new function.
Bryan O'Sullivan <bos@serpentine.com>
parents: 3370
diff changeset
   340
      (error "Creating patch... %s" (hg-chomp (cdr ret))))))
7b0d0acea6d6 mq.el: add mq-new function.
Bryan O'Sullivan <bos@serpentine.com>
parents: 3370
diff changeset
   341
4423
2647f1fbc24c mq.el: add mq-edit-series function.
Bryan O'Sullivan <bos@serpentine.com>
parents: 4422
diff changeset
   342
(defun mq-edit-series ()
2647f1fbc24c mq.el: add mq-edit-series function.
Bryan O'Sullivan <bos@serpentine.com>
parents: 4422
diff changeset
   343
  "Edit the MQ series file directly."
2647f1fbc24c mq.el: add mq-edit-series function.
Bryan O'Sullivan <bos@serpentine.com>
parents: 4422
diff changeset
   344
  (interactive)
2647f1fbc24c mq.el: add mq-edit-series function.
Bryan O'Sullivan <bos@serpentine.com>
parents: 4422
diff changeset
   345
  (let ((root (hg-root)))
2647f1fbc24c mq.el: add mq-edit-series function.
Bryan O'Sullivan <bos@serpentine.com>
parents: 4422
diff changeset
   346
    (unless root
2647f1fbc24c mq.el: add mq-edit-series function.
Bryan O'Sullivan <bos@serpentine.com>
parents: 4422
diff changeset
   347
      (error "Not in an MQ repository!"))
2647f1fbc24c mq.el: add mq-edit-series function.
Bryan O'Sullivan <bos@serpentine.com>
parents: 4422
diff changeset
   348
    (find-file (concat root ".hg/patches/series"))))
2647f1fbc24c mq.el: add mq-edit-series function.
Bryan O'Sullivan <bos@serpentine.com>
parents: 4422
diff changeset
   349
4424
1d31302c4522 mq.el: add mq-diff function.
Bryan O'Sullivan <bos@serpentine.com>
parents: 4423
diff changeset
   350
(defun mq-diff ()
1d31302c4522 mq.el: add mq-diff function.
Bryan O'Sullivan <bos@serpentine.com>
parents: 4423
diff changeset
   351
  "Display a diff of the topmost applied patch."
1d31302c4522 mq.el: add mq-diff function.
Bryan O'Sullivan <bos@serpentine.com>
parents: 4423
diff changeset
   352
  (interactive)
1d31302c4522 mq.el: add mq-diff function.
Bryan O'Sullivan <bos@serpentine.com>
parents: 4423
diff changeset
   353
  (hg-view-output ((format "MQ: Diff of %s" (mq-patch-info "qtop")))
1d31302c4522 mq.el: add mq-diff function.
Bryan O'Sullivan <bos@serpentine.com>
parents: 4423
diff changeset
   354
    (call-process (hg-binary) nil t nil "qdiff")
1d31302c4522 mq.el: add mq-diff function.
Bryan O'Sullivan <bos@serpentine.com>
parents: 4423
diff changeset
   355
    (diff-mode)
1d31302c4522 mq.el: add mq-diff function.
Bryan O'Sullivan <bos@serpentine.com>
parents: 4423
diff changeset
   356
    (font-lock-fontify-buffer)))
1d31302c4522 mq.el: add mq-diff function.
Bryan O'Sullivan <bos@serpentine.com>
parents: 4423
diff changeset
   357
3007
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
   358

425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
   359
(provide 'mq)
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
   360
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
   361

425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
   362
;;; Local Variables:
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
   363
;;; prompt-to-byte-compile: nil
425413d9ef59 Emacs: add mq.el, early support for Mercurial Queues.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
   364
;;; end: