Mercurial > emacs
view lisp/vc-sccs.el @ 92870:8f17f65dd575
* textmodes/org.el (org-ctrl-c-star): Implement a missing branch
in the decision tree.
(org-select-remember-template): Cleaned the code.
(org-prepare-dblock): Added the extra :content parameter.
(org-write-agenda): New output type ".ics" files.
(org-write-agenda): Call `org-icalendar-verify-function', both for
time stamps and for TODO entries.
(org-agenda-collect-markers, org-create-marker-find-array)
(org-check-agenda-marker-table): New functions.
(org-agenda-marker-table): New variable.
(org-export-as-html): Revert the change that killed the html
buffer. Side effects first need to be studied carefully.
(org-get-tags-at): Fix the structure of the condition-case
statement.
(org-ts-regexp0, org-repeat-re, org-display-custom-time)
(org-timestamp-change): Fix regulear expressions to swallow the
extra character for repeat-shift control.
(org-auto-repeat-maybe): Implement the new repeater mechanisms.
(org-get-legal-level): Aliased to `org-get-valid-level'.
(org-dblock-write:clocktable): Added a :link parameter, linking
headlines to their location in the Org agenda files.
(org-get-tags-at): Bugfix: prevent `org-back-to-heading' from
throwing an error when getting tags before headlines.
(org-timestamp-change, org-modify-ts-extra)
(org-ts-regexp1): Fix timestamp editing.
(org-agenda-custom-commands-local-options): New constant.
(org-agenda-custom-commands): Use
`org-agenda-custom-commands-local-options' to improve customize
type. "htmlize": Removed hack to fix face problem with htmlize,
it no longer seem necessary.
(org-follow-link-hook): New hook.
(org-agenda-custom-commands): Added "Component" as a tag for each
item in a command serie.
(org-open-at-point): Run `org-follow-link-hook'.
(org-agenda-schedule): Bugfix: don't display marker type when it
is `nil'.
(org-store-link): org-irc required.
(org-set-regexps-and-options): Parse the new logging options.
(org-extract-log-state-settings): New function.
(org-todo): Handle the new ways of recording state change stuff.
(org-local-logging): New function.
(org-columns-open-link): Fixed bug with opening link in column
view.
(org-local-logging): New function
(org-todo): Make sure that LOGGING properties are honoured.
(org-todo-keywords): Improve docstring.
(org-startup-options): Cleanup startup options.
(org-set-regexps-and-options): Process the "!" markers.
(org-todo): Respect the new logging stuff.
(org-log-note-how): New variable.
(org-add-log-maybe): New parameter HOW that defines how logging
should be done and also overrides PURPOSE. Add a docstring.
(org-add-log-note): Check if we really need to ask for a note.
(org-get-current-options): Digest the new keyword.
(org-agenda-reset-markers): Renamed from
`org-agenda-maybe-reset-markers'. FORCE argument removed.
(org-diary, org-agenda-quit, org-prepare-agenda): Call the renamed
function, without force argument.
(org-buffer-property-keys): Bind local variables s and p.
(org-make-tags-matcher): Allow "" to match an empty or
non-existent property value.
(org-export-as-html): Join unsorted lists when they directly
follow each other. Such lists may be created by headlines that
are converted to lists.
(org-nofm-to-completion): New function.
(org-export-as-html): Use :html-extension instead of
org-export-html-extension.
(org-store-link): Support for links from `rmail-summary-mode'.
(org-columns-new, org-complete, org-set-property): Set the
`include-columns' argument in the call to
`org-buffer-property-keys'.
(org-buffer-property-keys): New argument `include-columns', to
include properties expected by any of the COLUMS formats in the
current buffer.
(org-cleaned-string-for-export): Get rid of drawers first, so that
they will be removed also in the text before the first headline.
(org-clock-report): Show the clocktable when found.
(org-refile): Fix positioning bug when `org-reverse-note-order' is
nil.
(org-version): With prefix argument, insert `org-version' at
point.
(org-agenda-goto): Recenter the window after finding the target
location, to make sure the correct position will be displayed.
(org-agenda-get-deadlines): Don't scale priority with the warning
period.
(org-insert-heading): Don't break line in the middle of the line.
(org-agenda-get-deadlines): Allow `org-deadline-warning-days' to
be 0.
(org-update-checkbox-count): Revamped to deal with hierarchical
beckboxes. This was a patch from Miguel A. Figueroa-Villanueva.
(org-remove-timestamp-with-keyword): New function.
(org-schedule, org-deadline): Use
`org-remove-timestamp-with-keyword' to make sure all such time
stamps are removed.
(org-mode): Support for `align'.
(org-agenda-get-deadlines): Make sure priorities increase as the
due date approaches and is passed.
(org-remember-apply-template): Fixed problem with tags that
contain "_" or "@".
(org-make-link-regexps): Improve the regular expression for plain
links.
(org-agenda-get-closed): List each clocking entry.
(org-set-tags): Only tabify before tags if indent-tabs-mode is t.
(org-special-ctrl-k): New option.
(org-kill-line): New function.
(org-archive-all-done): Fixed incorrect number of stars in regexp.
(org-refile-get-location): New function.
(org-refile-goto-last-stored): New function.
(org-global-tags-completion-table): Add the value of org-tag-alist
in each buffer, to make sure that also unused tags will be
available for completion.
(org-columns-edit-value)
(org-columns-next-allowed-value): Only update if not in agenda.
(org-clocktable-steps): New function.
(org-dblock-write:clocktable): Call `org-clocktable-steps'.
(org-archive-subtree): Add the outline tree context as a property.
(org-closest-date): New optional argument `prefer'.
(org-goto-auto-isearch): New option.
(org-goto-map, org-get-location): Implement auto-isearch.
(org-goto-local-auto-isearch-map): New variable.
(org-goto-local-search-forward-headings)
(org-goto-local-auto-isearch): New functions
author | Carsten Dominik <dominik@science.uva.nl> |
---|---|
date | Thu, 13 Mar 2008 08:54:11 +0000 |
parents | c1eed47c8247 |
children | 112903000f93 |
line wrap: on
line source
;;; vc-sccs.el --- support for SCCS version-control ;; Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, ;; 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 ;; Free Software Foundation, Inc. ;; Author: FSF (see vc.el for full credits) ;; Maintainer: Andre Spiegel <spiegel@gnu.org> ;; This file is part of GNU Emacs. ;; GNU Emacs 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. ;; GNU Emacs 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: ;; TODO: ;; - remove call to vc-expand-dirs by implementing our own (which can just ;; list the SCCS subdir instead). ;;; Code: (eval-when-compile (require 'vc)) ;;; ;;; Customization options ;;; (defcustom vc-sccs-register-switches nil "*Extra switches for registering a file in SCCS. A string or list of strings passed to the checkin program by \\[vc-sccs-register]." :type '(choice (const :tag "None" nil) (string :tag "Argument String") (repeat :tag "Argument List" :value ("") string)) :version "21.1" :group 'vc) (defcustom vc-sccs-diff-switches nil "*A string or list of strings specifying extra switches for `vcdiff', the diff utility used for SCCS under VC." :type '(choice (const :tag "None" nil) (string :tag "Argument String") (repeat :tag "Argument List" :value ("") string)) :version "21.1" :group 'vc) (defcustom vc-sccs-header (or (cdr (assoc 'SCCS vc-header-alist)) '("%W%")) "*Header keywords to be inserted by `vc-insert-headers'." :type '(repeat string) :group 'vc) ;;;###autoload (defcustom vc-sccs-master-templates '("%sSCCS/s.%s" "%ss.%s" vc-sccs-search-project-dir) "*Where to look for SCCS master files. For a description of possible values, see `vc-check-master-templates'." :type '(choice (const :tag "Use standard SCCS file names" ("%sSCCS/s.%s" "%ss.%s" vc-sccs-search-project-dir)) (repeat :tag "User-specified" (choice string function))) :version "21.1" :group 'vc) ;;; ;;; Internal variables ;;; (defconst vc-sccs-name-assoc-file "VC-names") ;;; Properties of the backend (defun vc-sccs-revision-granularity () 'file) ;;; ;;; State-querying functions ;;; ;;; The autoload cookie below places vc-sccs-registered directly into ;;; loaddefs.el, so that vc-sccs.el does not need to be loaded for ;;; every file that is visited. The definition is repeated below ;;; so that Help and etags can find it. ;;;###autoload (defun vc-sccs-registered(f) (vc-default-registered 'SCCS f)) (defun vc-sccs-registered (f) (vc-default-registered 'SCCS f)) (defun vc-sccs-state (file) "SCCS-specific function to compute the version control state." (with-temp-buffer (if (vc-insert-file (vc-sccs-lock-file file)) (let* ((locks (vc-sccs-parse-locks)) (working-revision (vc-working-revision file)) (locking-user (cdr (assoc working-revision locks)))) (if (not locking-user) (if (vc-workfile-unchanged-p file) 'up-to-date 'unlocked-changes) (if (string= locking-user (vc-user-login-name file)) 'edited locking-user))) 'up-to-date))) (defun vc-sccs-state-heuristic (file) "SCCS-specific state heuristic." (if (not (vc-mistrust-permissions file)) ;; This implementation assumes that any file which is under version ;; control and has -rw-r--r-- is locked by its owner. This is true ;; for both RCS and SCCS, which keep unlocked files at -r--r--r--. ;; We have to be careful not to exclude files with execute bits on; ;; scripts can be under version control too. Also, we must ignore the ;; group-read and other-read bits, since paranoid users turn them off. (let* ((attributes (file-attributes file 'string)) (owner-name (nth 2 attributes)) (permissions (nth 8 attributes))) (if (string-match ".r-..-..-." permissions) 'up-to-date (if (string-match ".rw..-..-." permissions) (if (file-ownership-preserved-p file) 'edited owner-name) ;; Strange permissions. ;; Fall through to real state computation. (vc-sccs-state file)))) (vc-sccs-state file))) (defun vc-sccs-working-revision (file) "SCCS-specific version of `vc-working-revision'." (with-temp-buffer ;; The working revision is always the latest revision number. ;; To find this number, search the entire delta table, ;; rather than just the first entry, because the ;; first entry might be a deleted ("R") revision. (vc-insert-file (vc-name file) "^\001e\n\001[^s]") (vc-parse-buffer "^\001d D \\([^ ]+\\)" 1))) (defun vc-sccs-checkout-model (file) "SCCS-specific version of `vc-checkout-model'." 'locking) (defun vc-sccs-workfile-unchanged-p (file) "SCCS-specific implementation of `vc-workfile-unchanged-p'." (zerop (apply 'vc-do-command nil 1 "vcdiff" (vc-name file) (list "--brief" "-q" (concat "-r" (vc-working-revision file)))))) ;;; ;;; State-changing functions ;;; (defun vc-sccs-create-repo () "Create a new SCCS repository." ;; SCCS is totally file-oriented, so all we have to do is make the directory (make-directory "SCCS")) (defun vc-sccs-register (files &optional rev comment) "Register FILES into the SCCS version-control system. REV is the optional revision number for the file. COMMENT can be used to provide an initial description of FILES. `vc-register-switches' and `vc-sccs-register-switches' are passed to the SCCS command (in that order). Automatically retrieve a read-only version of the files with keywords expanded if `vc-keep-workfiles' is non-nil, otherwise, delete the workfile." (dolist (file files) (let* ((dirname (or (file-name-directory file) "")) (basename (file-name-nondirectory file)) (project-file (vc-sccs-search-project-dir dirname basename))) (let ((vc-name (or project-file (format (car vc-sccs-master-templates) dirname basename)))) (apply 'vc-do-command nil 0 "admin" vc-name (and rev (not (string= rev "")) (concat "-r" rev)) "-fb" (concat "-i" (file-relative-name file)) (and comment (concat "-y" comment)) (vc-switches 'SCCS 'register))) (delete-file file) (if vc-keep-workfiles (vc-do-command nil 0 "get" (vc-name file)))))) (defun vc-sccs-responsible-p (file) "Return non-nil if SCCS thinks it would be responsible for registering FILE." ;; TODO: check for all the patterns in vc-sccs-master-templates (or (file-directory-p (expand-file-name "SCCS" (file-name-directory file))) (stringp (vc-sccs-search-project-dir (or (file-name-directory file) "") (file-name-nondirectory file))))) (defun vc-sccs-checkin (files rev comment) "SCCS-specific version of `vc-backend-checkin'." (dolist (file files) (apply 'vc-do-command nil 0 "delta" (vc-name file) (if rev (concat "-r" rev)) (concat "-y" comment) (vc-switches 'SCCS 'checkin)) (if vc-keep-workfiles (vc-do-command nil 0 "get" (vc-name file))))) (defun vc-sccs-find-revision (file rev buffer) (apply 'vc-do-command buffer 0 "get" (vc-name file) "-s" ;; suppress diagnostic output "-p" (and rev (concat "-r" (vc-sccs-lookup-triple file rev))) (vc-switches 'SCCS 'checkout))) (defun vc-sccs-checkout (file &optional editable rev) "Retrieve a copy of a saved revision of SCCS controlled FILE. EDITABLE non-nil means that the file should be writable and locked. REV is the revision to check out." (let ((file-buffer (get-file-buffer file)) switches) (message "Checking out %s..." file) (save-excursion ;; Change buffers to get local value of vc-checkout-switches. (if file-buffer (set-buffer file-buffer)) (setq switches (vc-switches 'SCCS 'checkout)) ;; Save this buffer's default-directory ;; and use save-excursion to make sure it is restored ;; in the same buffer it was saved in. (let ((default-directory default-directory)) (save-excursion ;; Adjust the default-directory so that the check-out creates ;; the file in the right place. (setq default-directory (file-name-directory file)) (and rev (or (string= rev "") (not (stringp rev))) (setq rev nil)) (apply 'vc-do-command nil 0 "get" (vc-name file) (if editable "-e") (and rev (concat "-r" (vc-sccs-lookup-triple file rev))) switches)))) (message "Checking out %s...done" file))) (defun vc-sccs-rollback (files) "Roll back, undoing the most recent checkins of FILES." (if (not files) (error "SCCS backend doesn't support directory-level rollback.")) (dolist (file files) (let ((discard (vc-working-revision file))) (if (null (yes-or-no-p (format "Remove version %s from %s history? " discard file))) (error "Aborted")) (message "Removing revision %s from %s..." discard file) (vc-do-command nil 0 "rmdel" (vc-name file) (concat "-r" discard)) (vc-do-command nil 0 "get" (vc-name file) nil)))) (defun vc-sccs-revert (file &optional contents-done) "Revert FILE to the version it was based on." (vc-do-command nil 0 "unget" (vc-name file)) (vc-do-command nil 0 "get" (vc-name file)) ;; Checking out explicit revisions is not supported under SCCS, yet. ;; We always "revert" to the latest revision; therefore ;; vc-working-revision is cleared here so that it gets recomputed. (vc-file-setprop file 'vc-working-revision nil)) (defun vc-sccs-steal-lock (file &optional rev) "Steal the lock on the current workfile for FILE and revision REV." (vc-do-command nil 0 "unget" (vc-name file) "-n" (if rev (concat "-r" rev))) (vc-do-command nil 0 "get" (vc-name file) "-g" (if rev (concat "-r" rev)))) (defun vc-sccs-modify-change-comment (files rev comment) "Modify (actually, append to) the change comments for FILES on a specified REV." (dolist (file files) (vc-do-command nil 0 "cdc" (vc-name file) (concat "-y" comment) (concat "-r" rev)))) ;;; ;;; History functions ;;; (defun vc-sccs-print-log (files &optional buffer) "Get change log associated with FILES." (vc-do-command buffer 0 "prs" (mapcar 'vc-name files))) (defun vc-sccs-wash-log () "Remove all non-comment information from log output." ;; FIXME: not implemented for SCCS nil) (defun vc-sccs-logentry-check () "Check that the log entry in the current buffer is acceptable for SCCS." (when (>= (buffer-size) 512) (goto-char 512) (error "Log must be less than 512 characters; point is now at pos 512"))) (defun vc-sccs-diff (files &optional oldvers newvers buffer) "Get a difference report using SCCS between two filesets." (setq oldvers (vc-sccs-lookup-triple (car files) oldvers)) (setq newvers (vc-sccs-lookup-triple (car files) newvers)) (apply 'vc-do-command (or buffer "*vc-diff*") 1 "vcdiff" (mapcar 'vc-name (vc-expand-dirs files)) (append (list "-q" (and oldvers (concat "-r" oldvers)) (and newvers (concat "-r" newvers))) (vc-switches 'SCCS 'diff)))) ;;; ;;; Snapshot system ;;; (defun vc-sccs-assign-name (file name) "Assign to FILE's latest revision a given NAME." (vc-sccs-add-triple name file (vc-working-revision file))) ;;; ;;; Miscellaneous ;;; (defun vc-sccs-check-headers () "Check if the current file has any headers in it." (save-excursion (goto-char (point-min)) (re-search-forward "%[A-Z]%" nil t))) (defun vc-sccs-rename-file (old new) ;; Move the master file (using vc-rcs-master-templates). (vc-rename-master (vc-name old) new vc-sccs-master-templates) ;; Update the snapshot file. (with-current-buffer (find-file-noselect (expand-file-name vc-sccs-name-assoc-file (file-name-directory (vc-name old)))) (goto-char (point-min)) ;; (replace-regexp (concat ":" (regexp-quote old) "$") (concat ":" new)) (while (re-search-forward (concat ":" (regexp-quote old) "$") nil t) (replace-match (concat ":" new) nil nil)) (basic-save-buffer) (kill-buffer (current-buffer)))) ;;; ;;; Internal functions ;;; (defun vc-sccs-root (dir) (vc-find-root dir "SCCS" t)) ;; This function is wrapped with `progn' so that the autoload cookie ;; copies the whole function itself into loaddefs.el rather than just placing ;; a (autoload 'vc-sccs-search-project-dir "vc-sccs") which would not ;; help us avoid loading vc-sccs. ;;;###autoload (progn (defun vc-sccs-search-project-dir (dirname basename) "Return the name of a master file in the SCCS project directory. Does not check whether the file exists but returns nil if it does not find any project directory." (let ((project-dir (getenv "PROJECTDIR")) dirs dir) (when project-dir (if (file-name-absolute-p project-dir) (setq dirs '("SCCS" "")) (setq dirs '("src/SCCS" "src" "source/SCCS" "source")) (setq project-dir (expand-file-name (concat "~" project-dir)))) (while (and (not dir) dirs) (setq dir (expand-file-name (car dirs) project-dir)) (unless (file-directory-p dir) (setq dir nil) (setq dirs (cdr dirs)))) (and dir (expand-file-name (concat "s." basename) dir)))))) (defun vc-sccs-lock-file (file) "Generate lock file name corresponding to FILE." (let ((master (vc-name file))) (and master (string-match "\\(.*/\\)\\(s\\.\\)\\(.*\\)" master) (replace-match "p." t t master 2)))) (defun vc-sccs-parse-locks () "Parse SCCS locks in current buffer. The result is a list of the form ((REVISION . USER) (REVISION . USER) ...)." (let (master-locks) (goto-char (point-min)) (while (re-search-forward "^\\([0-9.]+\\) [0-9.]+ \\([^ ]+\\) .*\n?" nil t) (setq master-locks (cons (cons (match-string 1) (match-string 2)) master-locks))) ;; FIXME: is it really necessary to reverse ? (nreverse master-locks))) (defun vc-sccs-add-triple (name file rev) (with-current-buffer (find-file-noselect (expand-file-name vc-sccs-name-assoc-file (file-name-directory (vc-name file)))) (goto-char (point-max)) (insert name "\t:\t" file "\t" rev "\n") (basic-save-buffer) (kill-buffer (current-buffer)))) (defun vc-sccs-lookup-triple (file name) "Return the numeric revision corresponding to a named snapshot of FILE. If NAME is nil or a revision number string it's just passed through." (if (or (null name) (let ((firstchar (aref name 0))) (and (>= firstchar ?0) (<= firstchar ?9)))) name (with-temp-buffer (vc-insert-file (expand-file-name vc-sccs-name-assoc-file (file-name-directory (vc-name file)))) (vc-parse-buffer (concat name "\t:\t" file "\t\\(.+\\)") 1)))) (provide 'vc-sccs) ;; arch-tag: d751dee3-d7b3-47e1-95e3-7ae98c052041 ;;; vc-sccs.el ends here