Mercurial > emacs
view lisp/pcvs-parse.el @ 94414:d86cb59eea9f
2008-04-27 Carsten Dominik <dominik@science.uva.nl>
* org/org.el (org-html-level-start): Always have id's in HTML
(org-export-as-html): Use `org-link-protocols' to
retrieve the export form of the link.
(org-add-link-type): Final parameter renamed from PUBLISH. Better
documentation of how it is to be used. Avoid double entries for
the same link type.
(org-add-link-props): New function.
(org-modules-loaded): New variable.
(org-load-modules-maybe, org-set-modules): New function.
(org-modules): New option.
(org-mode, org-cycle, orgstruct-mode, org-run-like-in-org-mode)
(orgtbl-mode, org-store-link, org-insert-link-global)
(org-open-at-point): Call `org-load-modules-maybe'.
(org-search-view): Add more text properties.
(org-agenda-schedule, org-agenda-deadline): Allow also in
search-type agendas.
(org-search-view): Order of arguments has been changed.
Interpret prefix-arg as TODO-ONLY.
(org-agenda, org-run-agenda-series, org-agenda-manipulate-query):
Take new argument order of `org-search-view' into account.
(org-todo-only): New variable.
(org-search-syntax-table): New variable and function.
(org-search-view): Do the search with the special syntax table.
(define-obsolete-function-alias): Make work with XEmacs.
(org-add-planning-info): Use old date as default when modifying an
existing deadline or scheduled item.
(org-agenda-compute-time-span): Make argument N optional.
(org-agenda-format-date-aligned): Require `cal-iso'.
(org-agenda-list): Include week into into agenda heading, don't
list it at each date (only on Mondays).
(org-read-date-analyze): Define local variable `iso-date'.
(org-agenda-format-date-aligned): Remove dependency on
`calendar-time-from-absolute'.
(org-remember-apply-template, org-go-to-remember-target):
Interpret filenames relative to `org-directory'.
(org-complete): Silently fail when trying to complete
keywords that don't have a default value.
(org-get-current-options): Added a #+DATE: option.
(org-additional-option-like-keywords): Removed "DATE:" from the
list of additional keywords.
(org-export-as-html): Removed (current-time) as unnecessary second
argument of `format-time-string'.
(org-clock-find-position): Handle special case at end of
buffer.
(org-agenda-day-view): New argument DAY-OF-YEAR, pass it on to
`org-agenda-change-time-span'.
(org-agenda-week-view): New argument ISO-WEEK, pass it on to
`org-agenda-change-time-span'.
(org-agenda-month-view): New argument MONTH, pass it on to
`org-agenda-change-time-span'.
(org-agenda-year-view): New argument YEAR, pass it on to
`org-agenda-change-time-span'.
(org-agenda-change-time-span): New optional argument N, pass it on
to `org-agenda-compute-time-span'.
(org-agenda-compute-time-span): New argument N, interpret it by
changing the starting day.
(org-small-year-to-year): New function.
(org-scheduled-past-days): Respect
`org-scheduled-past-days'.
(org-auto-repeat-maybe): Make sure that repeating
dates are pushed into the future, and that the shift is at least
one interval, never 0.
(org-update-checkbox-count): Fix bug with checkbox
counting.
(org-add-note): New command.
(org-add-log-setup): Renamed from `org-add-log-maybe'.
(org-log-note-headings): New entry for plain notes (i.e. notes not
related to state changes or clocking).
(org-get-org-file): Check for availability of
`remember-data-file'.
(org-cached-entry-get): Allow a regexp value for
`org-use-property-inheritance'.
(org-use-property-inheritance): Allow regexp value. Fix bug in
customization type.
(org-use-tag-inheritance): Allow a list and a regexp value for
this variable.
(org-scan-tags, org-get-tags-at): Implement selective tag
inheritance.
(org-entry-get): Respect value `selective' for the INHERIT
argument.
(org-tag-inherit-p, org-property-inherit-p): New functions.
(org-agenda-format-date-aligned): Allow 10 characters for
weekday, to acomodate German locale.
(org-add-archive-files): New function.
(org-agenda-files): New argument `ext', to
get archive files as well.
(org-tbl-menu): Protect the use of variables that
are only available when org-table.el gets loaded.
(org-read-agenda-file-list): Error if `org-agenda-files' is a
single directory.
(org-open-file): Allow a batch process to trigger
waiting after executing a system command.
(org-store-link): Link to headline when there is not
target and no region in an org-mode buffer when creating a link.
(org-link-types-re): New variable.
(org-make-link-regexps): Compute `org-link-types-re'.
(org-make-link-description-function): New option.
(org-agenda-date, org-agenda-date-weekend): New faces.
(org-archive-sibling-heading): New option.
(org-archive-to-archive-sibling): New function.
(org-iswitchb): New command.
(org-buffer-list): New function.
(org-agenda-columns): Also try the #+COLUMNS line in
the buffer associated with the entry at point (or with the first
entry in the agenda view).
(org-modules): Add entry for org-bibtex.el.
(org-completion-fallback-command): Moved into `org-completion'
group.
(org-clock-heading-function): Moved to `org-progress' group.
(org-auto-repeat-maybe): Make sure that a note can
be enforces if `org-log-repeat' is `note'.
(org-modules): Allow additional symbols for external
packages.
(org-ctrl-c-ctrl-c): Allow for `org-clock-overlays' to be
undefined.
(org-clock-goto): Hide drawers after showing an
entry with `org-clock-goto.'
(org-shiftup, org-shiftdown, org-shiftright, org-shiftleft): Try
also a clocktable block shift.
(org-clocktable-try-shift): New function.
(org-columns-hscoll-title): New function.
(org-columns-previous-hscroll): New variable.
(org-columns-full-header-line-format): New variable.
(org-columns-display-here-title, org-columns-remove-overlays):
Install `org-columns-hscoll-title' in post-command-hook.
* org/org.el: Split into many small files.
* org/org-agenda.el: New file, split off from org.el.
* org/org-archive.el: New file, split off from org.el.
* org/org-bbdb.el: New file.
* org/org-bibtex.el: New file, split off from org.el.
* org/org-clock.el: New file, split off from org.el.
* org/org-colview.el: New file, split off from org.el.
* org/org-compat.el: New file, split off from org.el.
* org/org-exp.el: New file, split off from org.el.
* org/org-faces.el: New file, split off from org.el.
* org/org-gnus.el: New file, split off from org.el.
* org/org-info.el: New file, split off from org.el.
* org/org-infojs.el: New file.
* org/org-irc.el: New file.
* org/org-macs.el: New file, split off from org.el.
* org/org-mew.el: New file.
* org/org-mhe.el: New file, split off from org.el.
* org/org-publish.el: New file, split off from org.el.
* org/org-remember.el: New file, split off from org.el.
* org/org-rmail.el: New file, split off from org.el.
* org/org-table.el: New file, split off from org.el.
* org/org-vm.el: New file, split off from org.el.
* org/org-wl.el: New file, split off from org.el.
2008-04-27 Jason Riedy <jason@acm.org>
* lisp/org-table.el (orgtbl-to-generic): Add a :remove-nil-lines
parameter that supresses lines that evaluate to NIL.
(orgtbl-get-fmt): New inline function for
picking apart formats that may be lists.
(orgtbl-apply-fmt): New inline function for applying formats that
may be functions.
(orgtbl-eval-str): New inline function for strings that may be
functions.
(orgtbl-format-line, orgtbl-to-generic): Use and document.
(orgtbl-to-latex, orgtbl-to-texinfo): Document.
(*orgtbl-llfmt*, *orgtbl-llstart*)
(*orgtbl-llend*): Dynamic variables for last-line formatting.
(orgtbl-format-section): Shift formatting to support detecting the
last line and formatting it specially.
(orgtbl-to-generic): Document :ll* formats. Set to the non-ll
formats unless overridden.
(orgtbl-to-latex): Suggest using :llend to suppress the final \\.
(*orgtbl-table*, *orgtbl-rtn*): Dynamically
bound variables to hold the input collection of lines and output
formatted text.
(*orgtbl-hline*, *orgtbl-sep*, *orgtbl-fmt*, *orgtbl-efmt*,
(*orgtbl-lfmt*, *orgtbl-lstart*, *orgtbl-lend*): Dynamically bound
format parameters.
(orgtbl-format-line): New function encapsulating formatting for a
single line.
(orgtbl-format-section): Similar for each section. Rebinding the
dynamic vars customizes the formatting for each section.
(orgtbl-to-generic): Use orgtbl-format-line and
orgtbl-format-section.
(org-get-param): Now unused, so delete.
(orgtbl-gather-send-defs): New function to
gather all the SEND definitions before a table.
(orgtbl-send-replace-tbl): New function to find the RECEIVE
corresponding to the current name.
(orgtbl-send-table): Use the previous two functions and implement
multiple destinations for each table.
* doc/org.texi (A LaTeX example): Note that fmt may be a
one-argument function, and efmt may be a two-argument function.
(Radio tables): Document multiple destinations.
2008-04-27 Carsten Dominik <dominik@science.uva.nl>
* org/org-agenda.el (org-add-to-diary-list): New function.
(org-prefix-has-effort): New variable.
(org-sort-agenda-noeffort-is-high): New option.
(org-agenda-columns-show-summaries)
(org-agenda-columns-compute-summary-properties): New options.
(org-format-agenda-item): Compute the duration of the item.
(org-agenda-weekend-days): New variable.
(org-agenda-list, org-timeline): Use the proper faces for dates in
the agenda and timeline buffers.
(org-agenda-archive-to-archive-sibling): New command.
(org-agenda-start-with-clockreport-mode): New option.
(org-agenda-clockreport-parameter-plist): New option.
(org-agenda-clocktable-mode): New variable.
(org-agenda-deadline-leaders): Allow a function value for the
deadline leader.
(org-agenda-get-deadlines): Deal with new function value.
* lisp/org-clock.el (org-clock): New customization group.
(org-clock-into-drawer, org-clock-out-when-done)
(org-clock-in-switch-to-state, org-clock-heading-function): Moved
into the new group.
(org-clock-out-remove-zero-time-clocks): New option.
(org-clock-out): Use `org-clock-out-remove-zero-time-clocks'.
(org-dblock-write:clocktable): Allow a Lisp form for the scope
parameter.
(org-dblock-write:clocktable): Fixed bug with total time
calculation.
(org-dblock-write:clocktable): Request the unrestricted list of
files.
(org-get-clocktable): New function.
(org-dblock-write:clocktable): Make sure :tstart and :tend can not
only be strings but also integers (an absolute day number) and
lists (m d y).
* org/org-colview.el (org-columns-next-allowed-value)
(org-columns-edit-value): Limit the effort for updatig in the
agenda to recomputing a single file.
(org-columns-compute): Only write property value if it has
changed. This avoids raising the buffer-change-flag
unnecessarily.
(org-agenda-colview-summarize)
(org-agenda-colview-compute): New functions.
(org-agenda-columns): Call `org-agenda-colview-summarize'.
* org/org-exp.el (org-export-run-in-background): New option.
(org-export-icalendar): Allow a batch process to trigger waiting
after executing a system command.
(org-export-preprocess-string): Renamed-from
`org-cleaned-string-for-export'.
(org-export-html-style): Made target class look like normal text.
(org-export-as-html): Make use of the better proprocessing in
`org-cleaned-string-for-export'.
(org-cleaned-string-for-export): Better treatment of heuristic
targets, many more internal links will now work in HTML export.
(org-get-current-options): Incorporate LINK_UP, LINK_HOME, and
INFOJS.
(org-export-inbuffer-options-extra): New variable.
(org-export-options-filters): New hook.
(org-infile-export-plist): Find also the settings keywords in
`org-export-inbuffer-options-extra'.
(org-infile-export-plist): Allow multiple #+OPTIONS lines and
multiple #+INFOJS_OPT lines.
(org-export-html-handle-js-options): New function.
(org-export-html-infojs-setup): New option.
(org-export-as-html): Call `org-export-html-handle-js-options'.
Add autoload to all entry points.
(org-skip-comments): Function removed.
* org/org-table.el (org-table-make-reference): Extra parenthesis
around single fields, to make sure that algebraic formulas get
correctly interpreted by calc.
(org-table-current-column): No longer interactive.
* org/org-export-latex.el (org-export-latex-preprocess): Renamed
from `org-export-latex-cleaned-string'.
2008-04-27 Bastien Guerry <bzg@altern.org>
* org/org-publish.el (org-publish-get-base-files-1): New function.
(org-publish-get-base-files): Use it.
(org-publish-temp-files): New variable.
Don't require 'dired-aux anymore.
(org-publish-initial-buffer): New variable.
(org-publish-org-to, org-publish): Use it.
(org-publish-get-base-files-1): Bug fix: get
the proper list of files when recursing thru a directory.
(org-publish-get-base-files): Use the :exclude property to skip
both files and directories.
author | Carsten Dominik <dominik@science.uva.nl> |
---|---|
date | Sun, 27 Apr 2008 18:33:39 +0000 |
parents | 107ccd98fa12 |
children | 606f2d163a64 ee5932bf781d |
line wrap: on
line source
;;; pcvs-parse.el --- the CVS output parser ;; Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, ;; 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ;; Author: Stefan Monnier <monnier@iro.umontreal.ca> ;; Keywords: pcl-cvs ;; 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: ;;; Bugs: ;; - when merging a modified file, if the merge says that the file already ;; contained in the changes, it marks the file as `up-to-date' although ;; it might still contain further changes. ;; Example: merging a zero-change commit. ;;; Code: (eval-when-compile (require 'cl)) (require 'pcvs-util) (require 'pcvs-info) ;; imported from pcvs.el (defvar cvs-execute-single-dir) ;; parse vars (defcustom cvs-update-prog-output-skip-regexp "$" "*A regexp that matches the end of the output from all cvs update programs. That is, output from any programs that are run by CVS (by the flag -u in the `modules' file - see cvs(5)) when `cvs update' is performed should terminate with a line that this regexp matches. It is enough that some part of the line is matched. The default (a single $) fits programs without output." :group 'pcl-cvs :type '(regexp :value "$")) (defcustom cvs-parse-ignored-messages '("Executing ssh-askpass to query the password.*$" ".*Remote host denied X11 forwarding.*$") "*A list of regexps matching messages that should be ignored by the parser. Each regexp should match a whole set of lines and should hence be terminated by `$'." :group 'pcl-cvs :type '(repeat regexp)) ;; a few more defvars just to shut up the compiler (defvar cvs-start) (defvar cvs-current-dir) (defvar cvs-current-subdir) (defvar dont-change-disc) ;;;; The parser (defconst cvs-parse-known-commands '("status" "add" "commit" "update" "remove" "checkout" "ci") "List of CVS commands whose output is understood by the parser.") (defun cvs-parse-buffer (parse-spec dont-change-disc &optional subdir) "Parse current buffer according to PARSE-SPEC. PARSE-SPEC is a function of no argument advancing the point and returning either a fileinfo or t (if the matched text should be ignored) or nil if it didn't match anything. DONT-CHANGE-DISC just indicates whether the command was changing the disc or not (useful to tell the difference between `cvs-examine' and `cvs-update' output. The path names should be interpreted as relative to SUBDIR (defaults to the `default-directory'). Return a list of collected entries, or t if an error occurred." (goto-char (point-min)) (let ((fileinfos ()) (cvs-current-dir "") (case-fold-search nil) (cvs-current-subdir (or subdir ""))) (while (not (or (eobp) (eq fileinfos t))) (let ((ret (cvs-parse-run-table parse-spec))) (cond ;; it matched a known information message ((cvs-fileinfo-p ret) (push ret fileinfos)) ;; it didn't match anything at all (impossible) ((and (consp ret) (cvs-fileinfo-p (car ret))) (setq fileinfos (append ret fileinfos))) ((null ret) (setq fileinfos t)) ;; it matched something that should be ignored (t nil)))) (nreverse fileinfos))) ;; All those parsing macros/functions should return a success indicator (defsubst cvs-parse-msg () (buffer-substring cvs-start (1- (point)))) ;;(defsubst COLLECT (exp) (push exp *result*)) ;;(defsubst PROG (e) t) ;;(defmacro SEQ (&rest seqs) (cons 'and seqs)) (defmacro cvs-match (re &rest matches) "Try to match RE and extract submatches. If RE matches, advance the point until the line after the match and then assign the variables as specified in MATCHES (via `setq')." (cons 'cvs-do-match (cons re (mapcar (lambda (match) `(cons ',(first match) ,(second match))) matches)))) (defun cvs-do-match (re &rest matches) "Internal function for the `cvs-match' macro. Match RE and if successful, execute MATCHES." ;; Is it a match? (when (looking-at re) (goto-char (match-end 0)) ;; Skip the newline (unless we already are at the end of the buffer). (when (and (eolp) (< (point) (point-max))) (forward-char)) ;; assign the matches (dolist (match matches t) (let ((val (cdr match))) (set (car match) (if (integerp val) (match-string val) val)))))) (defmacro cvs-or (&rest alts) "Try each one of the ALTS alternatives until one matches." `(let ((-cvs-parse-point (point))) ,(cons 'or (mapcar (lambda (es) `(or ,es (ignore (goto-char -cvs-parse-point)))) alts)))) (def-edebug-spec cvs-or t) ;; This is how parser tables should be executed (defun cvs-parse-run-table (parse-spec) "Run PARSE-SPEC and provide sensible default behavior." (unless (bolp) (forward-line 1)) ;this should never be needed (let ((cvs-start (point))) (cvs-or (funcall parse-spec) (dolist (re cvs-parse-ignored-messages) (when (cvs-match re) (return t))) ;; This is a parse error. Create a message-type fileinfo. (and (cvs-match ".*$") (cvs-create-fileinfo 'MESSAGE cvs-current-dir " " ;; (concat " Unknown msg: '" (cvs-parse-msg) ;; "'") :subtype 'ERROR))))) (defun cvs-parsed-fileinfo (type path &optional directory &rest keys) "Create a fileinfo. TYPE can either be a type symbol or a cons of the form (TYPE . SUBTYPE). PATH is the filename. DIRECTORY influences the way PATH is interpreted: - if it's a string, it denotes the directory in which PATH (which should then be a plain file name with no directory component) resides. - if it's nil, the PATH should not be trusted: if it has a directory component, use it, else, assume it is relative to the current directory. - else, the PATH should be trusted to be relative to the root directory (i.e. if there is no directory component, it means the file is inside the main directory). The remaining KEYS are passed directly to `cvs-create-fileinfo'." (let ((dir directory) (file path)) ;; only trust the directory if it's a string (unless (stringp directory) ;; else, if the directory is true, the path should be trusted (setq dir (or (file-name-directory path) (if directory ""))) (setq file (file-name-nondirectory path))) (let ((type (if (consp type) (car type) type)) (subtype (if (consp type) (cdr type)))) (when dir (setq cvs-current-dir dir)) (apply 'cvs-create-fileinfo type (concat cvs-current-subdir (or dir cvs-current-dir)) file (cvs-parse-msg) :subtype subtype keys)))) ;;;; CVS Process Parser Tables: ;;;; ;;;; The table for status and update could actually be merged since they ;;;; don't conflict. But they don't overlap much either. (defun cvs-parse-table () "Table of message objects for `cvs-parse-process'." (let (c file dir path base-rev subtype) (cvs-or (cvs-parse-status) (cvs-parse-merge) (cvs-parse-commit) ;; this is not necessary because the fileinfo merging will remove ;; such duplicate info and luckily the second info is the one we want. ;; (and (cvs-match "M \\(.*\\)$" (path 1)) ;; (cvs-parse-merge path)) ;; Normal file state indicator. (and (cvs-match "\\([MARCUPNJ?]\\) \\(.*\\)$" (c 1) (path 2)) ;; M: The file is modified by the user, and untouched in the repository. ;; A: The file is "cvs add"ed, but not "cvs ci"ed. ;; R: The file is "cvs remove"ed, but not "cvs ci"ed. ;; C: Conflict ;; U: The file is copied from the repository. ;; P: The file was patched from the repository. ;; ?: Unknown file. (let ((code (aref c 0))) (cvs-parsed-fileinfo (case code (?M 'MODIFIED) (?A 'ADDED) (?R 'REMOVED) (?? 'UNKNOWN) (?C (if (not dont-change-disc) 'CONFLICT ;; This is ambiguous. We should look for conflict markers in the ;; file to decide between CONFLICT and NEED-MERGE. With CVS-1.10 ;; servers, this should not be necessary, because they return ;; a complete merge output. (with-temp-buffer (ignore-errors (insert-file-contents path)) (goto-char (point-min)) (if (re-search-forward "^<<<<<<< " nil t) 'CONFLICT 'NEED-MERGE)))) (?J 'NEED-MERGE) ;not supported by standard CVS ((?U ?P) (if dont-change-disc 'NEED-UPDATE (cons 'UP-TO-DATE (if (eq code ?U) 'UPDATED 'PATCHED))))) path 'trust))) (and (cvs-match "pcl-cvs: descending directory \\(.*\\)$" (dir 1)) (setq cvs-current-subdir dir)) ;; A special cvs message (and (let ((case-fold-search t)) (cvs-match "cvs[.a-z]* [a-z]+: ")) (cvs-or ;; CVS is descending a subdirectory ;; (status says `examining' while update says `updating') (and (cvs-match "\\(Examining\\|Updating\\) \\(.*\\)$" (dir 2)) (let ((dir (if (string= "." dir) "" (file-name-as-directory dir)))) (cvs-parsed-fileinfo 'DIRCHANGE "." dir))) ;; [-n update] A new (or pruned) directory appeared but isn't traversed (and (cvs-match "New directory `\\(.*\\)' -- ignored$" (dir 1)) ;; (cvs-parsed-fileinfo 'MESSAGE " " (file-name-as-directory dir)) ;; These messages either correspond to a true new directory ;; that an update will bring in, or to a directory that's empty ;; on the current branch (either because it only exists in other ;; branches, or because it's been removed). (if (ignore-errors (with-temp-buffer (ignore-errors (insert-file-contents (expand-file-name ".cvsignore" (file-name-directory dir)))) (goto-char (point-min)) (re-search-forward (concat "^" (regexp-quote (file-name-nondirectory dir)) "/$") nil t))) t ;The user requested to ignore those messages. (cvs-parsed-fileinfo '(NEED-UPDATE . NEW-DIR) dir t))) ;; File removed, since it is removed (by third party) in repository. (and (cvs-or ;; some cvs versions output quotes around these files (cvs-match "warning: `\\(.*\\)' is not (any longer) pertinent$" (file 1)) (cvs-match "warning: \\(.*\\) is not (any longer) pertinent$" (file 1)) (cvs-match "`\\(.*\\)' is no longer in the repository$" (file 1)) (cvs-match "\\(.*\\) is no longer in the repository$" (file 1))) (cvs-parsed-fileinfo (if dont-change-disc '(NEED-UPDATE . REMOVED) 'DEAD) file)) ;; [add] (and (cvs-or (cvs-match "scheduling file `\\(.*\\)' for addition.*$" (path 1)) (cvs-match "re-adding file \\(.*\\) (in place of .*)$" (path 1))) (cvs-parsed-fileinfo 'ADDED path)) ;; [add] this will also show up as a `U <file>' (and (cvs-match "`?\\(.*?\\)'?, version \\(.*\\), resurrected$" (path 1) (base-rev 2)) ;; FIXME: resurrection only brings back the original version, ;; not the latest on the branch, so `up-to-date' is not always ;; what we want. (cvs-parsed-fileinfo '(UP-TO-DATE . RESURRECTED) path nil :base-rev base-rev)) ;; [remove] (and (cvs-match "removed `\\(.*\\)'$" (path 1)) (cvs-parsed-fileinfo 'DEAD path)) ;; [remove,merge] (and (cvs-match "scheduling `\\(.*\\)' for removal$" (file 1)) (cvs-parsed-fileinfo 'REMOVED file)) ;; [update] File removed by you, but not cvs rm'd (and (cvs-match "warning: \\(.*\\) was lost$" (path 1)) (cvs-match (concat "U " (regexp-quote path) "$")) (cvs-parsed-fileinfo (if dont-change-disc 'MISSING '(UP-TO-DATE . UPDATED)) path)) ;; Mode conflicts (rather than contents) (and (cvs-match "conflict: ") (cvs-or (cvs-match "removed \\(.*\\) was modified by second party$" (path 1) (subtype 'REMOVED)) (cvs-match "\\(.*\\) created independently by second party$" (path 1) (subtype 'ADDED)) (cvs-match "\\(.*\\) is modified but no longer in the repository$" (path 1) (subtype 'MODIFIED))) (cvs-match (concat "C " (regexp-quote path))) (cvs-parsed-fileinfo (cons 'CONFLICT subtype) path)) ;; Messages that should be shown to the user (and (cvs-or (cvs-match "move away \\(.*\\); it is in the way$" (file 1)) (cvs-match "warning: new-born \\(.*\\) has disappeared$" (file 1)) (cvs-match "sticky tag .* for file `\\(.*\\)' is not a branch$" (file 1))) (cvs-parsed-fileinfo 'MESSAGE file)) ;; File unknown. (and (cvs-match "use `.+ add' to create an entry for \\(.*\\)$" (path 1)) (cvs-parsed-fileinfo 'UNKNOWN path)) ;; [commit] (and (cvs-match "Up-to-date check failed for `\\(.+\\)'$" (file 1)) (cvs-parsed-fileinfo 'NEED-MERGE file)) ;; We use cvs-execute-multi-dir but cvs can't handle it ;; Probably because the cvs-client can but the cvs-server can't (and (cvs-match ".* files with '?/'? in their name.*$") (not cvs-execute-single-dir) (setq cvs-execute-single-dir t) (cvs-create-fileinfo 'MESSAGE "" " " "*** Add (setq cvs-execute-single-dir t) to your .emacs *** See the FAQ file or the variable's documentation for more info.")) ;; Cvs waits for a lock. Ignored: already handled by the process filter (cvs-match "\\[..:..:..\\] \\(waiting for\\|obtained\\) .*lock in .*$") ;; File you removed still exists. Ignore (will be noted as removed). (cvs-match ".* should be removed and is still there$") ;; just a note (cvs-match "use ['`].+ commit' to \\sw+ th\\sw+ files? permanently$") ;; [add,status] followed by a more complete status description anyway (and (cvs-match "nothing known about \\(.*\\)$" (path 1)) (cvs-parsed-fileinfo 'DEAD path 'trust)) ;; [update] problem with patch (cvs-match "checksum failure after patch to .*; will refetch$") (cvs-match "refetching unpatchable files$") ;; [commit] (cvs-match "Rebuilding administrative file database$") ;; ??? (cvs-match "--> Using per-directory sticky tag `.*'") ;; CVS is running a *info program. (and (cvs-match "Executing.*$") ;; Skip by any output the program may generate to stdout. ;; Note that pcl-cvs will get seriously confused if the ;; program prints anything to stderr. (re-search-forward cvs-update-prog-output-skip-regexp)))) (and (cvs-match "cvs[.ex]* \\[[a-z]+ aborted\\]:.*$") (cvs-parsed-fileinfo 'MESSAGE "")) ;; sadly you can't do much with these since the path is in the repository (cvs-match "Directory .* added to the repository$") ))) (defun cvs-parse-merge () (let (path base-rev head-rev type) ;; A merge (maybe with a conflict). (and (cvs-match "RCS file: .*$") ;; Squirrel away info about the files that were retrieved for merging (cvs-match "retrieving revision \\([0-9.]+\\)$" (base-rev 1)) (cvs-match "retrieving revision \\([0-9.]+\\)$" (head-rev 1)) (cvs-match "Merging differences between [0-9.]+ and [0-9.]+ into \\(.*\\)$" (path 1)) ;; eat up potential conflict warnings (cvs-or (cvs-match "\\(rcs\\)?merge:?\\( warning\\)?: \\(overlaps\\|conflicts\\) \\(or other problems \\)?during merge$" (type 'CONFLICT)) t) (cvs-or (and (cvs-match "cvs[.ex]* [a-z]+: ") (cvs-or (cvs-match "conflicts found in \\(.*\\)$" (path 1) (type 'CONFLICT)) (cvs-match "could not merge .*$") (cvs-match "restoring \\(.*\\) from backup file .*$" (path 1)))) t) ;; Is it a succesful merge? ;; Figure out result of merging (ie, was there a conflict?) (let ((qfile (regexp-quote path))) (cvs-or ;; Conflict (and (cvs-match (concat "C \\(.*" qfile "\\)$") (path 1) (type 'CONFLICT)) ;; C might be followed by a "suprious" U for non-mergeable files (cvs-or (cvs-match (concat "U \\(.*" qfile "\\)$")) t)) ;; Successful merge (cvs-match (concat "M \\(.*" qfile "\\)$") (path 1)) ;; The file already contained the modifications (cvs-match (concat "^\\(.*" qfile "\\) already contains the differences between .*$") (path 1) (type '(UP-TO-DATE . MERGED))) t) ;; FIXME: PATH might not be set yet. Sometimes the only path ;; information is in `RCS file: ...' (yuck!!). (cvs-parsed-fileinfo (if dont-change-disc 'NEED-MERGE (or type '(MODIFIED . MERGED))) path nil :merge (cons base-rev head-rev)))))) (defun cvs-parse-status () (let (nofile path base-rev head-rev type) (and (cvs-match "===================================================================$") (cvs-match "File: \\(no file \\)?\\(.*[^ \t]\\)[ \t]+Status: " (nofile 1) (path 2)) (cvs-or (cvs-match "Needs \\(Checkout\\|Patch\\)$" (type (if nofile 'MISSING 'NEED-UPDATE))) (cvs-match "Up-to-date$" (type (if nofile '(UP-TO-DATE . REMOVED) 'UP-TO-DATE))) (cvs-match "File had conflicts on merge$" (type 'MODIFIED)) (cvs-match ".*[Cc]onflict.*$" (type 'CONFLICT)) (cvs-match "Locally Added$" (type 'ADDED)) (cvs-match "Locally Removed$" (type 'REMOVED)) (cvs-match "Locally Modified$" (type 'MODIFIED)) (cvs-match "Needs Merge$" (type 'NEED-MERGE)) (cvs-match "Entry Invalid" (type '(NEED-MERGE . REMOVED))) (cvs-match ".*$" (type 'UNKNOWN))) (cvs-match "$") (cvs-or (cvs-match " *Version:[ \t]*\\([0-9.]+\\).*$" (base-rev 1)) ;; NOTE: there's no date on the end of the following for server mode... (cvs-match " *Working revision:[ \t]*-?\\([0-9.]+\\).*$" (base-rev 1)) ;; Let's not get all worked up if the format changes a bit (cvs-match " *Working revision:.*$")) (cvs-or (cvs-match " *RCS Version:[ \t]*\\([0-9.]+\\)[ \t]*.*$" (head-rev 1)) (cvs-match " *Repository revision:[ \t]*\\([0-9.]+\\)[ \t]*\\(.*\\)$" (head-rev 1)) (cvs-match " *Repository revision:.*")) (cvs-or (cvs-match " *Expansion option:.*") t) ;Optional CVSNT thingie. (cvs-or (cvs-match " *Commit Identifier:.*") t) ;Optional CVSNT thingie. (cvs-or (and ;; Sometimes those fields are missing. (cvs-match " *Sticky Tag:[ \t]*\\(.*\\)$") ; FIXME: use it. (cvs-match " *Sticky Date:[ \t]*\\(.*\\)$") ; FIXME: use it. (cvs-match " *Sticky Options:[ \t]*\\(.*\\)$")) ; FIXME: use it. t) (cvs-or (cvs-match " *Merge From:.*") t) ;Optional CVSNT thingie. (cvs-match "$") ;; ignore the tags-listing in the case of `status -v' (cvs-or (cvs-match " *Existing Tags:\n\\(\t.*\n\\)*$") t) (cvs-parsed-fileinfo type path nil :base-rev base-rev :head-rev head-rev)))) (defun cvs-parse-commit () (let (path file base-rev subtype) (cvs-or (and (cvs-or (cvs-match "\\(Checking in\\|Removing\\) \\(.*\\);$" (path 2)) t) (cvs-match ".*,v <-- \\(.*\\)$" (file 1)) (cvs-or ;; deletion (cvs-match "new revision: delete; previous revision: \\([0-9.]*\\)$" (subtype 'REMOVED) (base-rev 1)) ;; addition (cvs-match "initial revision: \\([0-9.]*\\)$" (subtype 'ADDED) (base-rev 1)) ;; update (cvs-match "new revision: \\([0-9.]*\\); previous revision: .*$" (subtype 'COMMITTED) (base-rev 1))) (cvs-or (cvs-match "done$") t) ;; In cvs-1.12.9 commit messages have been changed and became ;; ambiguous. More specifically, the `path' above is not given. ;; We assume here that in future releases the corresponding info will ;; be put into `file'. (progn ;; Try to remove the temp files used by VC. (vc-delete-automatic-version-backups (expand-file-name (or path file))) ;; it's important here not to rely on the default directory management ;; because `cvs commit' might begin by a series of Examining messages ;; so the processing of the actual checkin messages might begin with ;; a `current-dir' set to something different from "" (cvs-parsed-fileinfo (cons 'UP-TO-DATE subtype) (or path file) 'trust :base-rev base-rev))) ;; useless message added before the actual addition: ignored (cvs-match "RCS file: .*\ndone$")))) (provide 'pcvs-parse) ;; arch-tag: 35418375-1a23-40a0-957d-96b0262f91d6 ;;; pcvs-parse.el ends here