procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add vc-mtn.el.

Browse source
This commit is contained in:
Stefan Monnier 2007-09-14 16:33:47 +00:00
parent 6f00fa3383
commit b1dc6d44c9
4 changed files with 300 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
etc/NEWS
View file

@ -80,7 +80,9 @@ this variable.
*** VC backends can provide completion of revision names.
*** VC has some support for Mercurial (hg).
*** VC has some support for Mercurial (Hg).
*** VC has some support for Monotone (Mtn).
*** VC has some support for Bazaar (Bzr).

10
lisp/ChangeLog
View file

@ -1,3 +1,9 @@
2007-09-14 Stefan Monnier <monnier@iro.umontreal.ca>
* vc-mtn.el: New file.
* vc-hooks.el (vc-handled-backends): Add Mtn.
2007-09-13 Eli Zaretskii <eliz@gnu.org>
* files.el (find-file, find-file-other-window)
@ -9,12 +15,12 @@
2007-09-13 Jari Aalto <jari.aalto@cante.net>
* man.el (Man-default-man-entry): At end of line, continue looking
to the next line for possible end of hyphenated command.
to the next line for possible end of hyphenated command.
2007-09-13 Chris Moore <dooglus@gmail.com>
* shell.el (shell-resync-dirs): Don't move the cursor relative to
the command being edited.
the command being edited.
2007-09-13 Nick Roberts <nickrob@snap.net.nz>

7
lisp/vc-hooks.el
View file

@ -63,9 +63,10 @@ interpreted as hostnames."
:group 'vc)
(defcustom vc-handled-backends '(RCS CVS SVN SCCS Bzr Git Hg Arch MCVS)
;; Bzr, Git, Hg, Arch and MCVS come last because they are per-tree
;; rather than per-dir.
"*List of version control backends for which VC will be used.
;; RCS, CVS, SVN and SCCS come first because they are per-dir
;; rather than per-tree. RCS comes first because of the multibackend
;; support intended to use RCS for local commits (with a remote CVS server).
"List of version control backends for which VC will be used.
Entries in this list will be tried in order to determine whether a
file is under that sort of version control.
Removing an entry from the list prevents VC from being activated

285
lisp/vc-mtn.el Normal file
View file

@ -0,0 +1,285 @@
;;; vc-mtn.el --- VC backend for Monotone
;; Copyright (C) 2007 Free Software Foundation, Inc.
;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
;; Keywords:
;; This file is free software; you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
;; the Free Software Foundation; either version 3, or (at your option)
;; any later version.
;; This file is distributed in the hope that it will be useful,
;; 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
;; along with GNU Emacs; see the file COPYING. If not, write to
;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
;; Boston, MA 02110-1301, USA.
;;; Commentary:
;;
;;; Code:
(eval-when-compile (require 'cl) (require 'vc))
;; 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)
(defvar vc-mtn-command "mtn")
(unless (executable-find vc-mtn-command)
;; vc-mtn.el is 100% non-functional without the `mtn' executable.
(setq vc-handled-backends (delq 'Mtn vc-handled-backends)))
;;;###autoload
(defconst vc-mtn-admin-dir "_MTN")
;;;###autoload
(defconst vc-mtn-admin-format (concat vc-mtn-admin-dir "/format"))
;;;###autoload (defun vc-mtn-registered (file)
;;;###autoload (if (vc-find-root file vc-mtn-admin-format)
;;;###autoload (progn
;;;###autoload (load "vc-mtn")
;;;###autoload (vc-mtn-registered file))))
(defun vc-mtn-revision-granularity () 'repository)
(defun vc-mtn-checkout-model (file) 'implicit)
(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))))
(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."
(apply 'vc-do-command buffer okstatus vc-mtn-command files flags))
(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))
(re-search-forward "^ \\(?:patched \\(.*\\)\\|no changes$\\)")
(if (match-end 1)
'edited
'up-to-date))))
(defun vc-mtn-workfile-version (file)
;; 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))
(re-search-forward "Current branch: \\(.*\\)\nChanges against parent \\(.*\\)")
(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))
(re-search-forward "Current branch: \\(.*\\)\nChanges against parent \\(.*\\)")
(match-string 1))))
(defun vc-mtn-workfile-unchanged-p (file)
(not (eq (vc-mtn-state file) 'edited)))
;; 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))
:group 'vc)
(defun vc-mtn-mode-line-string (file)
"Return string for placement in modeline by `vc-mode-line' for FILE."
(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"
(case (vc-state file)
((up-to-date needs-patch) ?-)
(added ?@)
(t ?:))
branch)))
(defun vc-mtn-register (files &optional rest)
(vc-mtn-command nil 0 files "add"))
(defun vc-mtn-responsible-p (file) (vc-mtn-root file))
(defun vc-mtn-could-register (file) (vc-mtn-root file))
(defun vc-mtn-checkin (files rev comment)
(vc-mtn-command nil 0 files "commit" "-m" comment))
(defun vc-mtn-find-version (file rev buffer)
(vc-mtn-command buffer 0 file "cat" "-r" rev))
;; (defun vc-mtn-checkout (file &optional editable rev)
;; )
(defun vc-mtn-revert (file &optional contents-done)
(unless contents-done
(vc-mtn-command nil 0 file "revert")))
;; (defun vc-mtn-roolback (files)
;; )
(defun vc-mtn-print-log (files &optional buffer)
(vc-mtn-command buffer 0 files "log"))
(define-derived-mode vc-mtn-log-view-mode log-view-mode "Mtn-Log-View"
;; TODO: Not sure what to do about file markers for now.
(set (make-local-variable 'log-view-file-re) "\\'\\`")
;; 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))))))
;; (defun vc-mtn-show-log-entry (version)
;; )
(defun vc-mtn-wash-log (file))
(defalias 'vc-mtn-diff-tree 'vc-mtn-diff)
(defun vc-mtn-diff (files &optional rev1 rev2 buffer)
(apply 'vc-mtn-command (or buffer "*vc-diff*") 1 files "diff"
(append (if rev1 (list "-r" rev1)) (if rev2 (list "-r" rev2)))))
(defun vc-mtn-annotate-command (file buf &optional rev)
(apply 'vc-mtn-command buf 0 file "annotate"
(if rev (list "-r" rev))))
(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)))
(defun vc-mtn-revision-completion-table (file)
;; TODO: Implement completion for for selectors
;; TODO: Implement completion for composite selectors.
(lexical-let ((file file))
(lambda (string pred action)
(cond
;; "Tag" selectors.
((string-match "\\`t:" string)
(complete-with-action action
(mapcar (lambda (tag) (concat "t:" tag))
(vc-mtn-list-tags))
string pred))
;; "Branch" selectors.
((string-match "\\`b:" string)
(complete-with-action action
(mapcar (lambda (tag) (concat "b:" tag))
(vc-mtn-list-branches))
string pred))
;; "Head" selectors. Not sure how they differ from "branch" selectors.
((string-match "\\`h:" string)
(complete-with-action action
(mapcar (lambda (tag) (concat "h:" tag))
(vc-mtn-list-branches))
string pred))
;; "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.
"a:" "c:" "d:" "e:" "l:")
string pred))))))
(provide 'vc-mtn)
;; arch-tag: 2b89ffbc-cbb8-405a-9080-2eafd4becb70
;;; vc-mtn.el ends here