mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00
Code Issues Projects Releases Wiki Activity

* vc-hooks.el (vc-state): Document new 'ignored and 'unregistered

Browse source 
states. and the new return-value convention.  These are not
	actually used yet, just set.

	* vc-svn.el (vc-svn-parse-status): Set 'ignored and 'unregistered
	states when appropriate.

	* vc-hg.el (vc-hg-state,vc-hg-dir-state): Set 'ignored and
	'unregistered' when appropriate.

	* vc-git.el: Document that we don't set the new states yet.

	* vc.el (vc-dired-state-info): Display 'unregistered and
	'ignored states.

	* vc-cvs.el (vc-cvs-parse-status): Set the 'ignored state when
	appropriate.

	* vc-bzr.el (vc-bzr-dir-state): Set 'ignored and
	'unregistered' when appropriate.
This commit is contained in:
Eric S. Raymond 2007-12-28 18:16:55 +00:00
parent 0f67cc71b4
commit 722f037fc8
8 changed files with 73 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

22
lisp/vc-hooks.el
View file

@ -501,7 +501,27 @@ For registered files, the value returned is one of:
'added Scheduled to go into the repository on the next commit.
Often represented by vc-working-revision = \"0\" in VCSes
with monotonic IDs like Subversion and Mercxurial."
with monotonic IDs like Subversion and Mercurial.
'ignored The file showed up in a dir-state listing with a flag
indicating the version-control system is ignoring it,
Note: This property is not set reliably (some VCSes
don't have useful directory-status commands) so assume
that any file with vc-state nil might be ignorable
without VC knowing it.
'unregistered The file showed up in a dir-state listing with a flag
indicating that it is not under version control.
Note: This property is not set reliably (some VCSes
don't have useful directory-status commands) so assume
that any file with vc-state nil might be unregistered
without VC knowing it.
A return of nil from this function means we have no information on the
status of this file.
"
;; Note: in Emacs 22 and older, return of nil meant the file was unregistered.
;; This is potentially a source of backward-compatibility bugs.
;; FIXME: New (sub)states needed (?):
;; - `conflict' (i.e. `edited' with conflict markers)