Mercurial > emacs

comparison lisp/pcvs-info.el @ 49597:e88404e8f2cf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Trailing whitespace deleted.
author Juanma Barranquero <lekktu@gmail.com>
date Tue, 04 Feb 2003 12:29:42 +0000
parents 9a2cb7cc7942
children fa1c848a9779 d7ddb3e565de
comparison
equal deleted inserted replaced
49596:b06535145619 49597:e88404e8f2cf
2 2
3 ;; Copyright (C) 1991, 92, 93, 94, 95, 96, 97, 98, 99, 2000 Free Software Foundation, Inc. 3 ;; Copyright (C) 1991, 92, 93, 94, 95, 96, 97, 98, 99, 2000 Free Software Foundation, Inc.
4 4
5 ;; Author: Stefan Monnier <monnier@cs.yale.edu> 5 ;; Author: Stefan Monnier <monnier@cs.yale.edu>
6 ;; Keywords: pcl-cvs 6 ;; Keywords: pcl-cvs
7 ;; Revision: $Id: pcvs-info.el,v 1.13 2002/09/11 01:56:47 rms Exp $ 7 ;; Revision: $Id: pcvs-info.el,v 1.14 2003/01/14 21:53:39 monnier Exp $
8 8
9 ;; This file is part of GNU Emacs. 9 ;; This file is part of GNU Emacs.
10 10
11 ;; GNU Emacs is free software; you can redistribute it and/or modify 11 ;; GNU Emacs is free software; you can redistribute it and/or modify
12 ;; it under the terms of the GNU General Public License as published by 12 ;; it under the terms of the GNU General Public License as published by
168 ;; backup-file;; For MERGED and CONFLICT files after a \"cvs update\", 168 ;; backup-file;; For MERGED and CONFLICT files after a \"cvs update\",
169 ;; this is a full path to the backup file where the 169 ;; this is a full path to the backup file where the
170 ;; untouched version resides. 170 ;; untouched version resides.
171 171
172 ;; The meaning of the type field: 172 ;; The meaning of the type field:
173 173
174 ;; Value ---Used by--- Explanation 174 ;; Value ---Used by--- Explanation
175 ;; update status 175 ;; update status
176 ;; NEED-UPDATE x file needs update 176 ;; NEED-UPDATE x file needs update
177 ;; MODIFIED x x modified by you, unchanged in repository 177 ;; MODIFIED x x modified by you, unchanged in repository
178 ;; MERGED x x successful merge 178 ;; MERGED x x successful merge
267 t))) 267 t)))
268 fi 268 fi
269 (error "Invalid :%s in cvs-fileinfo %s" check fi)))) 269 (error "Invalid :%s in cvs-fileinfo %s" check fi))))
270 270
271 271
272 ;;;; 272 ;;;;
273 ;;;; State table to indicate what you can do when. 273 ;;;; State table to indicate what you can do when.
274 ;;;; 274 ;;;;
275 275
276 (defconst cvs-states 276 (defconst cvs-states
277 `((NEED-UPDATE update diff) 277 `((NEED-UPDATE update diff)
278 (UP-TO-DATE update nil remove diff safe-rm revert) 278 (UP-TO-DATE update nil remove diff safe-rm revert)
279 (MODIFIED update commit undo remove diff merge diff-base) 279 (MODIFIED update commit undo remove diff merge diff-base)