diff options
| author | Eric S. Raymond <esr@snark.thyrsus.com> | 2007-12-28 18:16:55 +0000 |
|---|---|---|
| committer | Eric S. Raymond <esr@snark.thyrsus.com> | 2007-12-28 18:16:55 +0000 |
| commit | 722f037fc8a4d7e22d700de4504b7db7a9927450 (patch) | |
| tree | 6888a2a7ec7b7363cd39d43fdfe9eaf0274a19b0 /lisp/vc-bzr.el | |
| parent | 0f67cc71b4047fd71b873a4e73644a097722869c (diff) | |
| download | emacs-722f037fc8a4d7e22d700de4504b7db7a9927450.tar.gz | |
* vc-hooks.el (vc-state): Document new 'ignored and 'unregistered
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.
Diffstat (limited to 'lisp/vc-bzr.el')
| -rw-r--r-- | lisp/vc-bzr.el | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/lisp/vc-bzr.el b/lisp/vc-bzr.el index c87424fb8f6..01599c91dff 100644 --- a/lisp/vc-bzr.el +++ b/lisp/vc-bzr.el @@ -533,8 +533,11 @@ Optional argument LOCALP is always ignored." ((looking-at "^renamed") (setq current-vc-state 'edited) (setq current-bzr-state 'renamed)) - ((looking-at "^\\(unknown\\|ignored\\)") - (setq current-vc-state nil) + ((looking-at "^ignored") + (setq current-vc-state 'ignored) + (setq current-bzr-state 'not-versioned)) + ((looking-at "^unknown") + (setq current-vc-state 'unregistered) (setq current-bzr-state 'not-versioned)) ((looking-at " ") ;; file names are indented by two spaces |