2012-04-26 03:18:47 +00:00
|
|
|
;;; vc-mtn.el --- VC backend for Monotone -*- lexical-binding: t -*-
|
2007-09-14 16:33:47 +00:00
|
|
|
|
2014-01-01 07:43:34 +00:00
|
|
|
;; Copyright (C) 2007-2014 Free Software Foundation, Inc.
|
2007-09-14 16:33:47 +00:00
|
|
|
|
|
|
|
|
;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
|
* lisp/finder.el (finder-known-keywords): Add keyword "vc"
for version control.
* add-log.el, cvs-status.el, diff.el, diff-mode.el, ediff.el,
* emerge.el, log-edit.el, log-view.el, pcvs.el, smerge-mode.el,
* vc-annotate.el, vc-bzr.el, vc-dir.el, vc-dispatcher.el, vc-git.el,
* vc-hg.el, vc-mtn.el, vc.el: Add keyword "vc".
2010-06-11 19:09:57 +00:00
|
|
|
;; Keywords: vc
|
2010-08-29 16:17:13 +00:00
|
|
|
;; Package: vc
|
2007-09-14 16:33:47 +00:00
|
|
|
|
2008-05-06 08:06:51 +00:00
|
|
|
;; This file is part of GNU Emacs.
|
|
|
|
|
|
|
|
|
|
;; GNU Emacs is free software: you can redistribute it and/or modify
|
2007-09-14 16:33:47 +00:00
|
|
|
;; it under the terms of the GNU General Public License as published by
|
2008-05-06 08:06:51 +00:00
|
|
|
;; the Free Software Foundation, either version 3 of the License, or
|
|
|
|
|
;; (at your option) any later version.
|
2007-09-14 16:33:47 +00:00
|
|
|
|
2008-05-06 08:06:51 +00:00
|
|
|
;; GNU Emacs is distributed in the hope that it will be useful,
|
2007-09-14 16:33:47 +00:00
|
|
|
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
|
;; GNU General Public License for more details.
|
|
|
|
|
|
|
|
|
|
;; You should have received a copy of the GNU General Public License
|
2008-05-06 08:06:51 +00:00
|
|
|
;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
|
2007-09-14 16:33:47 +00:00
|
|
|
|
|
|
|
|
;;; Commentary:
|
|
|
|
|
|
2010-06-09 11:27:56 +00:00
|
|
|
;;
|
2007-09-14 16:33:47 +00:00
|
|
|
|
2008-06-20 17:16:41 +00:00
|
|
|
;;; TODO:
|
|
|
|
|
|
|
|
|
|
;; - The `previous-version' VC method needs to be supported, 'D' in
|
|
|
|
|
;; log-view-mode uses it.
|
|
|
|
|
|
2007-09-14 16:33:47 +00:00
|
|
|
;;; Code:
|
|
|
|
|
|
More CL cleanups and reduction of use of cl.el.
* woman.el, winner.el, vc/vc-rcs.el, vc/vc-hooks.el, vc/vc-hg.el:
* vc/vc-git.el, vc/vc-dir.el, vc/vc-bzr.el, vc/vc-annotate.el:
* textmodes/tex-mode.el, textmodes/sgml-mode.el, tar-mode.el:
* strokes.el, ses.el, server.el, progmodes/js.el, progmodes/gdb-mi.el:
* progmodes/flymake.el, progmodes/ebrowse.el, progmodes/compile.el:
* play/tetris.el, play/snake.el, play/pong.el, play/landmark.el:
* play/hanoi.el, play/decipher.el, play/5x5.el, nxml/nxml-mode.el:
* net/secrets.el, net/quickurl.el, midnight.el, mail/footnote.el:
* image-dired.el, ibuffer.el, ibuf-macs.el, ibuf-ext.el, hexl.el:
* eshell/eshell.el, eshell/esh-io.el, eshell/esh-ext.el:
* eshell/esh-cmd.el, eshell/em-ls.el, eshell/em-hist.el:
* eshell/em-cmpl.el, eshell/em-banner.el:
* url/url.el, url/url-queue.el, url/url-parse.el, url/url-http.el:
* url/url-future.el, url/url-dav.el, url/url-cookie.el:
* calendar/parse-time.el, test/eshell.el: Use cl-lib.
* wid-browse.el, wdired.el, vc/vc.el, vc/vc-mtn.el, vc/vc-cvs.el:
* vc/vc-arch.el, tree-widget.el, textmodes/texinfo.el:
* textmodes/refill.el, textmodes/css-mode.el, term/tvi970.el:
* term/ns-win.el, term.el, shell.el, ps-samp.el:
* progmodes/perl-mode.el, progmodes/pascal.el, progmodes/gud.el:
* progmodes/glasses.el, progmodes/etags.el, progmodes/cwarn.el:
* play/gamegrid.el, play/bubbles.el, novice.el, notifications.el:
* net/zeroconf.el, net/xesam.el, net/snmp-mode.el, net/mairix.el:
* net/ldap.el, net/eudc.el, net/browse-url.el, man.el:
* mail/mailheader.el, mail/feedmail.el:
* url/url-util.el, url/url-privacy.el, url/url-nfs.el, url/url-misc.el:
* url/url-methods.el, url/url-gw.el, url/url-file.el, url/url-expand.el:
Dont use CL.
* ibuf-ext.el (ibuffer-mark-old-buffers): Use float-time.
* eshell/esh-opt.el (eshell-eval-using-options): Quote code with
`lambda' rather than with `quote'.
(eshell-do-opt): Adjust accordingly.
(eshell-process-option): Simplify.
* eshell/esh-var.el:
* eshell/em-script.el: Require `esh-opt' for eshell-eval-using-options.
* emacs-pcase.el (pcase--dontcare-upats, pcase--let*)
(pcase--expand, pcase--u1): Rename pcase's internal `dontcare' pattern
to `pcase--dontcare'.
* emacs-cl.el (labels): Mark obsolete.
(cl--letf, letf): Move to cl-lib.
(cl--letf*, letf*): Remove.
* emacs-cl-lib.el (cl-nth-value): Use defalias.
* emacs-cl-macs.el (cl-dolist, cl-dotimes): Add indent rule.
(cl-progv): Rewrite.
(cl--letf, cl-letf): Move from cl.el.
(cl-letf*): New macro.
* emacs-cl-extra.el (cl--progv-before, cl--progv-after): Remove.
2012-07-11 23:13:41 +00:00
|
|
|
(eval-when-compile (require 'vc))
|
2007-09-14 16:33:47 +00:00
|
|
|
|
2012-02-25 04:29:09 +00:00
|
|
|
(defgroup vc-mtn nil
|
|
|
|
|
"VC Monotone (mtn) backend."
|
|
|
|
|
:version "24.1"
|
|
|
|
|
:group 'vc)
|
|
|
|
|
|
2008-11-22 03:34:55 +00:00
|
|
|
(defcustom vc-mtn-diff-switches t
|
|
|
|
|
"String or list of strings specifying switches for monotone diff under VC.
|
2008-12-03 07:38:45 +00:00
|
|
|
If nil, use the value of `vc-diff-switches'. If t, use no switches."
|
2008-11-22 03:34:55 +00:00
|
|
|
:type '(choice (const :tag "Unspecified" nil)
|
|
|
|
|
(const :tag "None" t)
|
|
|
|
|
(string :tag "Argument String")
|
2008-12-03 07:38:45 +00:00
|
|
|
(repeat :tag "Argument List" :value ("") string))
|
2008-11-22 03:34:55 +00:00
|
|
|
:version "23.1"
|
2012-02-25 04:29:09 +00:00
|
|
|
:group 'vc-mtn)
|
2008-11-22 03:34:55 +00:00
|
|
|
|
|
|
|
|
(define-obsolete-variable-alias 'vc-mtn-command 'vc-mtn-program "23.1")
|
|
|
|
|
(defcustom vc-mtn-program "mtn"
|
|
|
|
|
"Name of the monotone executable."
|
|
|
|
|
:type 'string
|
2012-02-25 04:29:09 +00:00
|
|
|
:group 'vc-mtn)
|
2008-11-22 03:34:55 +00:00
|
|
|
|
2007-09-14 16:33:47 +00:00
|
|
|
;; Clear up the cache to force vc-call to check again and discover
|
|
|
|
|
;; new functions when we reload this file.
|
|
|
|
|
(put 'Mtn 'vc-functions nil)
|
|
|
|
|
|
2008-11-22 03:34:55 +00:00
|
|
|
(unless (executable-find vc-mtn-program)
|
2007-09-14 16:33:47 +00:00
|
|
|
;; vc-mtn.el is 100% non-functional without the `mtn' executable.
|
|
|
|
|
(setq vc-handled-backends (delq 'Mtn vc-handled-backends)))
|
|
|
|
|
|
|
|
|
|
;;;###autoload
|
2011-11-24 08:21:03 +00:00
|
|
|
(defconst vc-mtn-admin-dir "_MTN" "Name of the monotone directory.")
|
2007-09-14 16:33:47 +00:00
|
|
|
;;;###autoload
|
2011-11-24 08:21:03 +00:00
|
|
|
(defconst vc-mtn-admin-format (concat vc-mtn-admin-dir "/format")
|
|
|
|
|
"Name of the monotone directory's format file.")
|
2007-09-14 16:33:47 +00:00
|
|
|
|
|
|
|
|
;;;###autoload (defun vc-mtn-registered (file)
|
|
|
|
|
;;;###autoload (if (vc-find-root file vc-mtn-admin-format)
|
|
|
|
|
;;;###autoload (progn
|
2013-02-01 17:19:24 +00:00
|
|
|
;;;###autoload (load "vc-mtn" nil t)
|
2007-09-14 16:33:47 +00:00
|
|
|
;;;###autoload (vc-mtn-registered file))))
|
|
|
|
|
|
|
|
|
|
(defun vc-mtn-revision-granularity () 'repository)
|
2012-04-26 03:18:47 +00:00
|
|
|
(defun vc-mtn-checkout-model (_files) 'implicit)
|
2007-09-14 16:33:47 +00:00
|
|
|
|
|
|
|
|
(defun vc-mtn-root (file)
|
|
|
|
|
(setq file (if (file-directory-p file)
|
|
|
|
|
(file-name-as-directory file)
|
|
|
|
|
(file-name-directory file)))
|
|
|
|
|
(or (vc-file-getprop file 'vc-mtn-root)
|
|
|
|
|
(vc-file-setprop file 'vc-mtn-root
|
|
|
|
|
(vc-find-root file vc-mtn-admin-format))))
|
|
|
|
|
|
2013-10-04 23:47:00 +00:00
|
|
|
(defun vc-mtn-find-admin-dir (file)
|
|
|
|
|
"Return the administrative directory of FILE."
|
|
|
|
|
(expand-file-name vc-mtn-admin-dir (vc-mtn-root file)))
|
2007-09-14 16:33:47 +00:00
|
|
|
|
|
|
|
|
(defun vc-mtn-registered (file)
|
|
|
|
|
(let ((root (vc-mtn-root file)))
|
|
|
|
|
(when root
|
|
|
|
|
(vc-mtn-state file))))
|
|
|
|
|
|
|
|
|
|
(defun vc-mtn-command (buffer okstatus files &rest flags)
|
|
|
|
|
"A wrapper around `vc-do-command' for use in vc-mtn.el."
|
2008-04-03 02:22:55 +00:00
|
|
|
(let ((process-environment
|
|
|
|
|
;; Avoid localization of messages so we can parse the output.
|
|
|
|
|
(cons "LC_MESSAGES=C" process-environment)))
|
2008-11-22 03:34:55 +00:00
|
|
|
(apply 'vc-do-command (or buffer "*vc*") okstatus vc-mtn-program
|
|
|
|
|
files flags)))
|
2007-09-14 16:33:47 +00:00
|
|
|
|
|
|
|
|
(defun vc-mtn-state (file)
|
|
|
|
|
;; If `mtn' fails or returns status>0, or if the search files, just
|
|
|
|
|
;; return nil.
|
|
|
|
|
(ignore-errors
|
|
|
|
|
(with-temp-buffer
|
|
|
|
|
(vc-mtn-command t 0 file "status")
|
|
|
|
|
(goto-char (point-min))
|
2008-03-22 17:09:33 +00:00
|
|
|
(re-search-forward
|
|
|
|
|
"^ \\(?:\\(patched\\)\\|\\(added\\) \\(?:.*\\)\\)\\|no changes$")
|
|
|
|
|
(cond ((match-end 1) 'edited)
|
|
|
|
|
((match-end 2) 'added)
|
|
|
|
|
(t 'up-to-date)))))
|
2007-09-14 16:33:47 +00:00
|
|
|
|
2009-06-23 05:48:18 +00:00
|
|
|
(defun vc-mtn-after-dir-status (update-function)
|
|
|
|
|
(let (result)
|
|
|
|
|
(goto-char (point-min))
|
2010-11-08 18:42:24 +00:00
|
|
|
(re-search-forward "\\(?:Current b\\|B\\)ranch: *\\(.*\\)\n?\nChanges against parent \\(.*\\)" nil t)
|
2009-06-23 05:48:18 +00:00
|
|
|
(while (re-search-forward
|
|
|
|
|
"^ \\(?:\\(patched \\)\\|\\(added \\)\\)\\(.*\\)$" nil t)
|
|
|
|
|
(cond ((match-end 1) (push (list (match-string 3) 'edited) result))
|
|
|
|
|
((match-end 2) (push (list (match-string 3) 'added) result))))
|
|
|
|
|
(funcall update-function result)))
|
|
|
|
|
|
Silence some vc compilation warnings
* lisp/vc/vc-arch.el (vc-exec-after): Declare.
(vc-switches): Autoload.
* lisp/vc/vc-bzr.el: No need to require vc when compiling.
(vc-exec-after, vc-set-async-update, vc-default-dir-printer)
(vc-resynch-buffer, vc-dir-refresh): Declare.
(vc-setup-buffer, vc-switches): Autoload.
* lisp/vc/vc-dir.el (desktop-missing-file-warning): Declare.
* lisp/vc/vc-mtn.el (vc-exec-after): Declare.
(vc-switches): Autoload.
* lisp/vc/vc-rcs.el (vc-expand-dirs, vc-switches)
(vc-tag-precondition, vc-buffer-sync, vc-rename-master): Autoload.
(vc-file-tree-walk): Declare.
* lisp/vc/vc-svn.el (vc-exec-after): Declare.
(vc-switches, vc-setup-buffer): Autoload.
* lisp/obsolete/vc-mcvs.el (vc-checkout, vc-switches, vc-default-revert):
Autoload.
(vc-resynch-buffer): Declare.
2013-05-28 07:01:59 +00:00
|
|
|
;; -dir-status called from vc-dir, which loads vc, which loads vc-dispatcher.
|
|
|
|
|
(declare-function vc-exec-after "vc-dispatcher" (code))
|
|
|
|
|
|
2009-06-23 05:48:18 +00:00
|
|
|
(defun vc-mtn-dir-status (dir update-function)
|
|
|
|
|
(vc-mtn-command (current-buffer) 'async dir "status")
|
* lisp/vc/vc-dispatcher.el (vc-run-delayed): New macro.
(vc-do-command, vc-set-async-update):
* lisp/vc/vc-mtn.el (vc-mtn-dir-status):
* lisp/vc/vc-hg.el (vc-hg-dir-status, vc-hg-dir-status-files)
(vc-hg-pull, vc-hg-merge-branch):
* lisp/vc/vc-git.el (vc-git-dir-status-goto-stage, vc-git-pull)
(vc-git-merge-branch):
* lisp/vc/vc-cvs.el (vc-cvs-print-log, vc-cvs-dir-status)
(vc-cvs-dir-status-files):
* lisp/vc/vc-bzr.el (vc-bzr-pull, vc-bzr-merge-branch, vc-bzr-dir-status)
(vc-bzr-dir-status-files):
* lisp/vc/vc-arch.el (vc-arch-dir-status): Use vc-run-delayed.
* lisp/vc/vc-annotate.el: Use lexical-binding.
(vc-annotate-display-select, vc-annotate): Use vc-run-delayed.
(vc-sentinel-movepoint): Declare.
(vc-annotate): Don't use `goto-line'.
* lisp/vc/vc.el (vc-diff-internal): Prefer a closure to `(lambda...).
(vc-diff-internal, vc-log-internal-common): Use vc-run-delayed.
(vc-sentinel-movepoint): Declare.
* lisp/vc/vc-svn.el: Use lexical-binding.
(vc-svn-dir-status, vc-svn-dir-status-files): Use vc-run-delayed.
* lisp/vc/vc-sccs.el:
* lisp/vc/vc-rcs.el: Use lexical-binding.
2013-09-04 21:09:42 +00:00
|
|
|
(vc-run-delayed
|
|
|
|
|
(vc-mtn-after-dir-status update-function)))
|
2009-06-23 05:48:18 +00:00
|
|
|
|
2007-10-10 18:52:45 +00:00
|
|
|
(defun vc-mtn-working-revision (file)
|
2007-09-14 16:33:47 +00:00
|
|
|
;; If `mtn' fails or returns status>0, or if the search fails, just
|
|
|
|
|
;; return nil.
|
|
|
|
|
(ignore-errors
|
|
|
|
|
(with-temp-buffer
|
|
|
|
|
(vc-mtn-command t 0 file "status")
|
|
|
|
|
(goto-char (point-min))
|
2010-11-08 18:42:24 +00:00
|
|
|
(re-search-forward "\\(?:Current b\\|B\\)ranch: *\\(.*\\)\n?\nChanges against parent \\(.*\\)")
|
2007-09-14 16:33:47 +00:00
|
|
|
(match-string 2))))
|
|
|
|
|
|
|
|
|
|
(defun vc-mtn-workfile-branch (file)
|
|
|
|
|
;; If `mtn' fails or returns status>0, or if the search files, just
|
|
|
|
|
;; return nil.
|
|
|
|
|
(ignore-errors
|
|
|
|
|
(with-temp-buffer
|
|
|
|
|
(vc-mtn-command t 0 file "status")
|
|
|
|
|
(goto-char (point-min))
|
2010-11-08 18:42:24 +00:00
|
|
|
(re-search-forward "\\(?:Current b\\|B\\)ranch: *\\(.*\\)\n?\nChanges against parent \\(.*\\)")
|
2007-09-14 16:33:47 +00:00
|
|
|
(match-string 1))))
|
|
|
|
|
|
|
|
|
|
;; Mode-line rewrite code copied from vc-arch.el.
|
|
|
|
|
|
|
|
|
|
(defcustom vc-mtn-mode-line-rewrite
|
|
|
|
|
'(("\\`[^:/#]*[:/#]" . "")) ;Drop the host part.
|
|
|
|
|
"Rewrite rules to shorten Mtn's revision names on the mode-line."
|
|
|
|
|
:type '(repeat (cons regexp string))
|
2008-03-01 19:16:02 +00:00
|
|
|
:version "22.2"
|
2012-02-25 04:29:09 +00:00
|
|
|
:group 'vc-mtn)
|
2007-09-14 16:33:47 +00:00
|
|
|
|
|
|
|
|
(defun vc-mtn-mode-line-string (file)
|
2012-06-02 10:56:09 +00:00
|
|
|
"Return a string for `vc-mode-line' to put in the mode line for FILE."
|
2007-09-14 16:33:47 +00:00
|
|
|
(let ((branch (vc-mtn-workfile-branch file)))
|
|
|
|
|
(dolist (rule vc-mtn-mode-line-rewrite)
|
|
|
|
|
(if (string-match (car rule) branch)
|
|
|
|
|
(setq branch (replace-match (cdr rule) t nil branch))))
|
|
|
|
|
(format "Mtn%c%s"
|
More CL cleanups and reduction of use of cl.el.
* woman.el, winner.el, vc/vc-rcs.el, vc/vc-hooks.el, vc/vc-hg.el:
* vc/vc-git.el, vc/vc-dir.el, vc/vc-bzr.el, vc/vc-annotate.el:
* textmodes/tex-mode.el, textmodes/sgml-mode.el, tar-mode.el:
* strokes.el, ses.el, server.el, progmodes/js.el, progmodes/gdb-mi.el:
* progmodes/flymake.el, progmodes/ebrowse.el, progmodes/compile.el:
* play/tetris.el, play/snake.el, play/pong.el, play/landmark.el:
* play/hanoi.el, play/decipher.el, play/5x5.el, nxml/nxml-mode.el:
* net/secrets.el, net/quickurl.el, midnight.el, mail/footnote.el:
* image-dired.el, ibuffer.el, ibuf-macs.el, ibuf-ext.el, hexl.el:
* eshell/eshell.el, eshell/esh-io.el, eshell/esh-ext.el:
* eshell/esh-cmd.el, eshell/em-ls.el, eshell/em-hist.el:
* eshell/em-cmpl.el, eshell/em-banner.el:
* url/url.el, url/url-queue.el, url/url-parse.el, url/url-http.el:
* url/url-future.el, url/url-dav.el, url/url-cookie.el:
* calendar/parse-time.el, test/eshell.el: Use cl-lib.
* wid-browse.el, wdired.el, vc/vc.el, vc/vc-mtn.el, vc/vc-cvs.el:
* vc/vc-arch.el, tree-widget.el, textmodes/texinfo.el:
* textmodes/refill.el, textmodes/css-mode.el, term/tvi970.el:
* term/ns-win.el, term.el, shell.el, ps-samp.el:
* progmodes/perl-mode.el, progmodes/pascal.el, progmodes/gud.el:
* progmodes/glasses.el, progmodes/etags.el, progmodes/cwarn.el:
* play/gamegrid.el, play/bubbles.el, novice.el, notifications.el:
* net/zeroconf.el, net/xesam.el, net/snmp-mode.el, net/mairix.el:
* net/ldap.el, net/eudc.el, net/browse-url.el, man.el:
* mail/mailheader.el, mail/feedmail.el:
* url/url-util.el, url/url-privacy.el, url/url-nfs.el, url/url-misc.el:
* url/url-methods.el, url/url-gw.el, url/url-file.el, url/url-expand.el:
Dont use CL.
* ibuf-ext.el (ibuffer-mark-old-buffers): Use float-time.
* eshell/esh-opt.el (eshell-eval-using-options): Quote code with
`lambda' rather than with `quote'.
(eshell-do-opt): Adjust accordingly.
(eshell-process-option): Simplify.
* eshell/esh-var.el:
* eshell/em-script.el: Require `esh-opt' for eshell-eval-using-options.
* emacs-pcase.el (pcase--dontcare-upats, pcase--let*)
(pcase--expand, pcase--u1): Rename pcase's internal `dontcare' pattern
to `pcase--dontcare'.
* emacs-cl.el (labels): Mark obsolete.
(cl--letf, letf): Move to cl-lib.
(cl--letf*, letf*): Remove.
* emacs-cl-lib.el (cl-nth-value): Use defalias.
* emacs-cl-macs.el (cl-dolist, cl-dotimes): Add indent rule.
(cl-progv): Rewrite.
(cl--letf, cl-letf): Move from cl.el.
(cl-letf*): New macro.
* emacs-cl-extra.el (cl--progv-before, cl--progv-after): Remove.
2012-07-11 23:13:41 +00:00
|
|
|
(pcase (vc-state file)
|
|
|
|
|
((or `up-to-date `needs-update) ?-)
|
|
|
|
|
(`added ?@)
|
|
|
|
|
(_ ?:))
|
2007-09-14 16:33:47 +00:00
|
|
|
branch)))
|
|
|
|
|
|
2014-12-01 11:23:10 +00:00
|
|
|
(defun vc-mtn-register (files &optional _comment)
|
2007-09-14 16:33:47 +00:00
|
|
|
(vc-mtn-command nil 0 files "add"))
|
|
|
|
|
|
|
|
|
|
(defun vc-mtn-responsible-p (file) (vc-mtn-root file))
|
|
|
|
|
|
2010-06-09 11:27:56 +00:00
|
|
|
(declare-function log-edit-extract-headers "log-edit" (headers string))
|
|
|
|
|
|
Remove never-used rev argument from VC's backend checkin methods.
Alters vc/vc-arch.el, vc/vc-bzr.el, vc/vc-cvs.el, vc/vc-dav.el,
vc/vc-git.el, vc/vc-hg.el, vc/vc-mtn.el, vc/vc-rcs.el,
vc/vc-sccs.el, vc/vc-svn.el, vc/vc.el.
Only the RCS, SCCS, and CVS back ends tried to do anything with it,
and that code was never exercised. Chiseling away the cruft of
decades...
2014-11-20 07:37:06 +00:00
|
|
|
(defun vc-mtn-checkin (files comment)
|
2010-06-09 05:24:01 +00:00
|
|
|
(apply 'vc-mtn-command nil 0 files
|
|
|
|
|
(nconc (list "commit" "-m")
|
|
|
|
|
(log-edit-extract-headers '(("Author" . "--author")
|
|
|
|
|
("Date" . "--date"))
|
|
|
|
|
comment))))
|
2007-09-14 16:33:47 +00:00
|
|
|
|
2007-10-10 18:52:45 +00:00
|
|
|
(defun vc-mtn-find-revision (file rev buffer)
|
2007-09-14 16:33:47 +00:00
|
|
|
(vc-mtn-command buffer 0 file "cat" "-r" rev))
|
|
|
|
|
|
2014-11-20 08:52:24 +00:00
|
|
|
;; (defun vc-mtn-checkout (file &optional rev)
|
2007-09-14 16:33:47 +00:00
|
|
|
;; )
|
|
|
|
|
|
|
|
|
|
(defun vc-mtn-revert (file &optional contents-done)
|
|
|
|
|
(unless contents-done
|
|
|
|
|
(vc-mtn-command nil 0 file "revert")))
|
|
|
|
|
|
2011-12-30 02:52:49 +00:00
|
|
|
;; (defun vc-mtn-rollback (files)
|
2007-09-14 16:33:47 +00:00
|
|
|
;; )
|
|
|
|
|
|
2012-04-26 03:18:47 +00:00
|
|
|
(defun vc-mtn-print-log (files buffer &optional _shortlog start-revision limit)
|
2013-04-24 07:52:00 +00:00
|
|
|
"Print commit logs associated with FILES into specified BUFFER.
|
|
|
|
|
_SHORTLOG is ignored.
|
|
|
|
|
If START-REVISION is non-nil, it is the newest revision to show.
|
|
|
|
|
If LIMIT is non-nil, show no more than this many entries."
|
2009-11-15 20:28:58 +00:00
|
|
|
(apply 'vc-mtn-command buffer 0 files "log"
|
2009-12-07 09:02:11 +00:00
|
|
|
(append
|
2009-12-08 03:28:22 +00:00
|
|
|
(when start-revision (list "--from" (format "%s" start-revision)))
|
|
|
|
|
(when limit (list "--last" (format "%s" limit))))))
|
2007-09-14 16:33:47 +00:00
|
|
|
|
2007-10-20 06:30:18 +00:00
|
|
|
(defvar log-view-message-re)
|
|
|
|
|
(defvar log-view-file-re)
|
|
|
|
|
(defvar log-view-font-lock-keywords)
|
2008-06-20 17:16:41 +00:00
|
|
|
(defvar log-view-per-file-logs)
|
2007-10-20 06:30:18 +00:00
|
|
|
|
2007-09-14 16:33:47 +00:00
|
|
|
(define-derived-mode vc-mtn-log-view-mode log-view-mode "Mtn-Log-View"
|
2008-06-20 17:16:41 +00:00
|
|
|
;; Don't match anything.
|
|
|
|
|
(set (make-local-variable 'log-view-file-re) "\\`a\\`")
|
|
|
|
|
(set (make-local-variable 'log-view-per-file-logs) nil)
|
2007-09-14 16:33:47 +00:00
|
|
|
;; TODO: Use a more precise regexp than "[ |/]+" to avoid false positives
|
|
|
|
|
;; in the ChangeLog text.
|
|
|
|
|
(set (make-local-variable 'log-view-message-re)
|
|
|
|
|
"^[ |/]+Revision: \\([0-9a-f]+\\)")
|
|
|
|
|
(require 'add-log) ;For change-log faces.
|
|
|
|
|
(set (make-local-variable 'log-view-font-lock-keywords)
|
|
|
|
|
(append log-view-font-lock-keywords
|
|
|
|
|
'(("^[ |]+Author: \\(.*\\)" (1 'change-log-email))
|
|
|
|
|
("^[ |]+Date: \\(.*\\)" (1 'change-log-date-face))))))
|
|
|
|
|
|
2007-10-10 19:39:23 +00:00
|
|
|
;; (defun vc-mtn-show-log-entry (revision)
|
2007-09-14 16:33:47 +00:00
|
|
|
;; )
|
|
|
|
|
|
Silence some vc compilation warnings
* lisp/vc/vc-arch.el (vc-exec-after): Declare.
(vc-switches): Autoload.
* lisp/vc/vc-bzr.el: No need to require vc when compiling.
(vc-exec-after, vc-set-async-update, vc-default-dir-printer)
(vc-resynch-buffer, vc-dir-refresh): Declare.
(vc-setup-buffer, vc-switches): Autoload.
* lisp/vc/vc-dir.el (desktop-missing-file-warning): Declare.
* lisp/vc/vc-mtn.el (vc-exec-after): Declare.
(vc-switches): Autoload.
* lisp/vc/vc-rcs.el (vc-expand-dirs, vc-switches)
(vc-tag-precondition, vc-buffer-sync, vc-rename-master): Autoload.
(vc-file-tree-walk): Declare.
* lisp/vc/vc-svn.el (vc-exec-after): Declare.
(vc-switches, vc-setup-buffer): Autoload.
* lisp/obsolete/vc-mcvs.el (vc-checkout, vc-switches, vc-default-revert):
Autoload.
(vc-resynch-buffer): Declare.
2013-05-28 07:01:59 +00:00
|
|
|
(autoload 'vc-switches "vc")
|
|
|
|
|
|
2014-12-01 22:56:41 +00:00
|
|
|
(defun vc-mtn-diff (files &optional async rev1 rev2 buffer)
|
2008-11-22 03:34:55 +00:00
|
|
|
"Get a difference report using monotone between two revisions of FILES."
|
2014-12-01 22:56:41 +00:00
|
|
|
(apply 'vc-mtn-command (or buffer "*vc-diff*")
|
|
|
|
|
(if async 'async 1)
|
|
|
|
|
files "diff"
|
2008-11-22 03:34:55 +00:00
|
|
|
(append
|
2008-11-30 01:45:29 +00:00
|
|
|
(vc-switches 'mtn 'diff)
|
2008-11-22 03:34:55 +00:00
|
|
|
(if rev1 (list "-r" rev1)) (if rev2 (list "-r" rev2)))))
|
2007-09-14 16:33:47 +00:00
|
|
|
|
|
|
|
|
(defun vc-mtn-annotate-command (file buf &optional rev)
|
2009-09-14 04:42:04 +00:00
|
|
|
(apply 'vc-mtn-command buf 'async file "annotate"
|
2007-09-14 16:33:47 +00:00
|
|
|
(if rev (list "-r" rev))))
|
|
|
|
|
|
2008-06-24 02:41:04 +00:00
|
|
|
(declare-function vc-annotate-convert-time "vc-annotate" (time))
|
|
|
|
|
|
2007-09-14 16:33:47 +00:00
|
|
|
(defconst vc-mtn-annotate-full-re
|
|
|
|
|
"^ *\\([0-9a-f]+\\)\\.* by [^ ]+ \\([0-9]+\\)-\\([0-9]+\\)-\\([0-9]+\\): ")
|
|
|
|
|
(defconst vc-mtn-annotate-any-re
|
|
|
|
|
(concat "^\\(?: +: \\|" vc-mtn-annotate-full-re "\\)"))
|
|
|
|
|
|
|
|
|
|
(defun vc-mtn-annotate-time ()
|
|
|
|
|
(when (looking-at vc-mtn-annotate-any-re)
|
|
|
|
|
(goto-char (match-end 0))
|
|
|
|
|
(let ((year (match-string 2)))
|
|
|
|
|
(if (not year)
|
|
|
|
|
;; Look for the date on a previous line.
|
|
|
|
|
(save-excursion
|
|
|
|
|
(get-text-property (1- (previous-single-property-change
|
|
|
|
|
(point) 'vc-mtn-time nil (point-min)))
|
|
|
|
|
'vc-mtn-time))
|
|
|
|
|
(let ((time (vc-annotate-convert-time
|
|
|
|
|
(encode-time 0 0 0
|
|
|
|
|
(string-to-number (match-string 4))
|
|
|
|
|
(string-to-number (match-string 3))
|
|
|
|
|
(string-to-number year)
|
|
|
|
|
t))))
|
|
|
|
|
(let ((inhibit-read-only t)
|
|
|
|
|
(inhibit-modification-hooks t))
|
|
|
|
|
(put-text-property (match-beginning 0) (match-end 0)
|
|
|
|
|
'vc-mtn-time time))
|
|
|
|
|
time)))))
|
|
|
|
|
|
|
|
|
|
(defun vc-mtn-annotate-extract-revision-at-line ()
|
|
|
|
|
(save-excursion
|
|
|
|
|
(when (or (looking-at vc-mtn-annotate-full-re)
|
|
|
|
|
(re-search-backward vc-mtn-annotate-full-re nil t))
|
|
|
|
|
(match-string 1))))
|
|
|
|
|
|
|
|
|
|
;;; Revision completion.
|
|
|
|
|
|
|
|
|
|
(defun vc-mtn-list-tags ()
|
|
|
|
|
(with-temp-buffer
|
|
|
|
|
(vc-mtn-command t 0 nil "list" "tags")
|
|
|
|
|
(goto-char (point-min))
|
|
|
|
|
(let ((tags ()))
|
|
|
|
|
(while (re-search-forward "^[^ ]+" nil t)
|
|
|
|
|
(push (match-string 0) tags))
|
|
|
|
|
tags)))
|
|
|
|
|
|
|
|
|
|
(defun vc-mtn-list-branches ()
|
|
|
|
|
(with-temp-buffer
|
|
|
|
|
(vc-mtn-command t 0 nil "list" "branches")
|
|
|
|
|
(goto-char (point-min))
|
|
|
|
|
(let ((branches ()))
|
|
|
|
|
(while (re-search-forward "^.+" nil t)
|
|
|
|
|
(push (match-string 0) branches))
|
|
|
|
|
branches)))
|
|
|
|
|
|
|
|
|
|
(defun vc-mtn-list-revision-ids (prefix)
|
|
|
|
|
(with-temp-buffer
|
|
|
|
|
(vc-mtn-command t 0 nil "complete" "revision" prefix)
|
|
|
|
|
(goto-char (point-min))
|
|
|
|
|
(let ((ids ()))
|
|
|
|
|
(while (re-search-forward "^.+" nil t)
|
|
|
|
|
(push (match-string 0) ids))
|
|
|
|
|
ids)))
|
|
|
|
|
|
2012-04-26 03:18:47 +00:00
|
|
|
(defun vc-mtn-revision-completion-table (_files)
|
|
|
|
|
;; What about using `files'?!? --Stef
|
|
|
|
|
(lambda (string pred action)
|
|
|
|
|
(cond
|
2012-08-15 19:20:26 +00:00
|
|
|
;; Special chars for composite selectors.
|
|
|
|
|
((string-match ".*[^\\]\\(\\\\\\\\\\)*[/|;(]" string)
|
|
|
|
|
(completion-table-with-context (substring string 0 (match-end 0))
|
|
|
|
|
(vc-mtn-revision-completion-table nil)
|
|
|
|
|
(substring string (match-end 0))
|
|
|
|
|
pred action))
|
2012-04-26 03:18:47 +00:00
|
|
|
;; "Tag" selectors.
|
|
|
|
|
((string-match "\\`t:" string)
|
|
|
|
|
(complete-with-action action
|
|
|
|
|
(mapcar (lambda (tag) (concat "t:" tag))
|
|
|
|
|
(vc-mtn-list-tags))
|
|
|
|
|
string pred))
|
2012-08-15 19:20:26 +00:00
|
|
|
;; "Branch" or "Head" selectors.
|
|
|
|
|
((string-match "\\`[hb]:" string)
|
|
|
|
|
(let ((prefix (match-string 0 string)))
|
|
|
|
|
(complete-with-action action
|
|
|
|
|
(mapcar (lambda (tag) (concat prefix tag))
|
|
|
|
|
(vc-mtn-list-branches))
|
|
|
|
|
string pred)))
|
2012-04-26 03:18:47 +00:00
|
|
|
;; "ID" selectors.
|
|
|
|
|
((string-match "\\`i:" string)
|
|
|
|
|
(complete-with-action action
|
|
|
|
|
(mapcar (lambda (tag) (concat "i:" tag))
|
|
|
|
|
(vc-mtn-list-revision-ids
|
|
|
|
|
(substring string (match-end 0))))
|
|
|
|
|
string pred))
|
|
|
|
|
(t
|
|
|
|
|
(complete-with-action action
|
|
|
|
|
'("t:" "b:" "h:" "i:"
|
|
|
|
|
;; Completion not implemented for these.
|
2012-08-15 19:20:26 +00:00
|
|
|
"c:" "a:" "k:" "d:" "m:" "e:" "l:" "i:" "p:"
|
|
|
|
|
;; These have no arg to complete.
|
|
|
|
|
"u:" "w:"
|
|
|
|
|
;; Selector functions.
|
|
|
|
|
"difference(" "lca(" "max(" "ancestors("
|
|
|
|
|
"descendants(" "parents(" "children("
|
|
|
|
|
"pick(")
|
2012-04-26 03:18:47 +00:00
|
|
|
string pred)))))
|
2008-05-06 08:06:51 +00:00
|
|
|
|
|
|
|
|
|
2007-09-14 16:33:47 +00:00
|
|
|
|
|
|
|
|
(provide 'vc-mtn)
|
|
|
|
|
|
|
|
|
|
;;; vc-mtn.el ends here
|