diff options
| author | Juanma Barranquero | 2003-02-04 12:29:42 +0000 |
|---|---|---|
| committer | Juanma Barranquero | 2003-02-04 12:29:42 +0000 |
| commit | f1180544bb5ff44cdb45b8734734294b0a2fa7a4 (patch) | |
| tree | 626b0db999b924834efc1f437eb47776ea6bd797 /lisp/pcvs-parse.el | |
| parent | 37d1e6800ca66b7977ebafb51ddb31a9de077e15 (diff) | |
| download | emacs-f1180544bb5ff44cdb45b8734734294b0a2fa7a4.tar.gz emacs-f1180544bb5ff44cdb45b8734734294b0a2fa7a4.zip | |
Trailing whitespace deleted.
Diffstat (limited to 'lisp/pcvs-parse.el')
| -rw-r--r-- | lisp/pcvs-parse.el | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/lisp/pcvs-parse.el b/lisp/pcvs-parse.el index 4e008877da6..1b2db2eb18a 100644 --- a/lisp/pcvs-parse.el +++ b/lisp/pcvs-parse.el | |||
| @@ -5,7 +5,7 @@ | |||
| 5 | 5 | ||
| 6 | ;; Author: Stefan Monnier <monnier@cs.yale.edu> | 6 | ;; Author: Stefan Monnier <monnier@cs.yale.edu> |
| 7 | ;; Keywords: pcl-cvs | 7 | ;; Keywords: pcl-cvs |
| 8 | ;; Revision: $Id: pcvs-parse.el,v 1.12 2002/06/24 22:49:06 monnier Exp $ | 8 | ;; Revision: $Id: pcvs-parse.el,v 1.13 2002/09/03 01:23:15 monnier Exp $ |
| 9 | 9 | ||
| 10 | ;; This file is part of GNU Emacs. | 10 | ;; This file is part of GNU Emacs. |
| 11 | 11 | ||
| @@ -202,7 +202,7 @@ The remaining KEYS are passed directly to `cvs-create-fileinfo'." | |||
| 202 | "Table of message objects for `cvs-parse-process'." | 202 | "Table of message objects for `cvs-parse-process'." |
| 203 | (let (c file dir path type base-rev subtype) | 203 | (let (c file dir path type base-rev subtype) |
| 204 | (cvs-or | 204 | (cvs-or |
| 205 | 205 | ||
| 206 | (cvs-parse-status) | 206 | (cvs-parse-status) |
| 207 | (cvs-parse-merge) | 207 | (cvs-parse-merge) |
| 208 | (cvs-parse-commit) | 208 | (cvs-parse-commit) |
| @@ -211,7 +211,7 @@ The remaining KEYS are passed directly to `cvs-create-fileinfo'." | |||
| 211 | ;; such duplicate info and luckily the second info is the one we want. | 211 | ;; such duplicate info and luckily the second info is the one we want. |
| 212 | ;; (and (cvs-match "M \\(.*\\)$" (path 1)) | 212 | ;; (and (cvs-match "M \\(.*\\)$" (path 1)) |
| 213 | ;; (cvs-parse-merge path)) | 213 | ;; (cvs-parse-merge path)) |
| 214 | 214 | ||
| 215 | ;; Normal file state indicator. | 215 | ;; Normal file state indicator. |
| 216 | (and | 216 | (and |
| 217 | (cvs-match "\\([MARCUPNJ?]\\) \\(.*\\)$" (c 1) (path 2)) | 217 | (cvs-match "\\([MARCUPNJ?]\\) \\(.*\\)$" (c 1) (path 2)) |
| @@ -311,7 +311,7 @@ The remaining KEYS are passed directly to `cvs-create-fileinfo'." | |||
| 311 | 'MISSING | 311 | 'MISSING |
| 312 | '(UP-TO-DATE . UPDATED)) | 312 | '(UP-TO-DATE . UPDATED)) |
| 313 | path)) | 313 | path)) |
| 314 | 314 | ||
| 315 | ;; Mode conflicts (rather than contents) | 315 | ;; Mode conflicts (rather than contents) |
| 316 | (and | 316 | (and |
| 317 | (cvs-match "conflict: ") | 317 | (cvs-match "conflict: ") |
| @@ -333,7 +333,7 @@ The remaining KEYS are passed directly to `cvs-create-fileinfo'." | |||
| 333 | (cvs-match "sticky tag .* for file `\\(.*\\)' is not a branch$" | 333 | (cvs-match "sticky tag .* for file `\\(.*\\)' is not a branch$" |
| 334 | (file 1))) | 334 | (file 1))) |
| 335 | (cvs-parsed-fileinfo 'MESSAGE file)) | 335 | (cvs-parsed-fileinfo 'MESSAGE file)) |
| 336 | 336 | ||
| 337 | ;; File unknown. | 337 | ;; File unknown. |
| 338 | (and (cvs-match "use `.+ add' to create an entry for \\(.*\\)$" (path 1)) | 338 | (and (cvs-match "use `.+ add' to create an entry for \\(.*\\)$" (path 1)) |
| 339 | (cvs-parsed-fileinfo 'UNKNOWN path)) | 339 | (cvs-parsed-fileinfo 'UNKNOWN path)) |
| @@ -351,7 +351,7 @@ The remaining KEYS are passed directly to `cvs-create-fileinfo'." | |||
| 351 | 'MESSAGE "" " " | 351 | 'MESSAGE "" " " |
| 352 | "*** Add (setq cvs-execute-single-dir t) to your .emacs *** | 352 | "*** Add (setq cvs-execute-single-dir t) to your .emacs *** |
| 353 | See the FAQ file or the variable's documentation for more info.")) | 353 | See the FAQ file or the variable's documentation for more info.")) |
| 354 | 354 | ||
| 355 | ;; Cvs waits for a lock. Ignored: already handled by the process filter | 355 | ;; Cvs waits for a lock. Ignored: already handled by the process filter |
| 356 | (cvs-match "\\[..:..:..\\] \\(waiting for\\|obtained\\) .*lock in .*$") | 356 | (cvs-match "\\[..:..:..\\] \\(waiting for\\|obtained\\) .*lock in .*$") |
| 357 | ;; File you removed still exists. Ignore (will be noted as removed). | 357 | ;; File you removed still exists. Ignore (will be noted as removed). |
| @@ -368,7 +368,7 @@ The remaining KEYS are passed directly to `cvs-create-fileinfo'." | |||
| 368 | (cvs-match "Rebuilding administrative file database$") | 368 | (cvs-match "Rebuilding administrative file database$") |
| 369 | ;; ??? | 369 | ;; ??? |
| 370 | (cvs-match "--> Using per-directory sticky tag `.*'") | 370 | (cvs-match "--> Using per-directory sticky tag `.*'") |
| 371 | 371 | ||
| 372 | ;; CVS is running a *info program. | 372 | ;; CVS is running a *info program. |
| 373 | (and | 373 | (and |
| 374 | (cvs-match "Executing.*$") | 374 | (cvs-match "Executing.*$") |
| @@ -380,7 +380,7 @@ The remaining KEYS are passed directly to `cvs-create-fileinfo'." | |||
| 380 | (and | 380 | (and |
| 381 | (cvs-match "cvs[.ex]* \\[[a-z]+ aborted\\]:.*$") | 381 | (cvs-match "cvs[.ex]* \\[[a-z]+ aborted\\]:.*$") |
| 382 | (cvs-parsed-fileinfo 'MESSAGE "")) | 382 | (cvs-parsed-fileinfo 'MESSAGE "")) |
| 383 | 383 | ||
| 384 | ;; sadly you can't do much with these since the path is in the repository | 384 | ;; sadly you can't do much with these since the path is in the repository |
| 385 | (cvs-match "Directory .* added to the repository$") | 385 | (cvs-match "Directory .* added to the repository$") |
| 386 | ))) | 386 | ))) |
| @@ -502,7 +502,7 @@ The remaining KEYS are passed directly to `cvs-create-fileinfo'." | |||
| 502 | ;; a `current-dir' set to something different from "" | 502 | ;; a `current-dir' set to something different from "" |
| 503 | (cvs-parsed-fileinfo (cons 'UP-TO-DATE subtype) path 'trust | 503 | (cvs-parsed-fileinfo (cons 'UP-TO-DATE subtype) path 'trust |
| 504 | :base-rev base-rev))) | 504 | :base-rev base-rev))) |
| 505 | 505 | ||
| 506 | ;; useless message added before the actual addition: ignored | 506 | ;; useless message added before the actual addition: ignored |
| 507 | (cvs-match "RCS file: .*\ndone$")))) | 507 | (cvs-match "RCS file: .*\ndone$")))) |
| 508 | 508 | ||