Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
c6a84d17
Commit
c6a84d17
authored
Jul 04, 2001
by
Stefan Monnier
Browse files
(vc-cvs-stay-local): doc fix.
parent
8b6f4c0a
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
20 additions
and
21 deletions
+20
-21
lisp/vc-cvs.el
lisp/vc-cvs.el
+20
-21
No files found.
lisp/vc-cvs.el
View file @
c6a84d17
...
@@ -5,7 +5,7 @@
...
@@ -5,7 +5,7 @@
;; Author: FSF (see vc.el for full credits)
;; Author: FSF (see vc.el for full credits)
;; Maintainer: Andre Spiegel <spiegel@gnu.org>
;; Maintainer: Andre Spiegel <spiegel@gnu.org>
;; $Id: vc-cvs.el,v 1.2
1
2001/0
3
/1
0 10:49:05 spiegel
Exp $
;; $Id: vc-cvs.el,v 1.2
2
2001/0
4
/1
7 05:59:57 eliz
Exp $
;; This file is part of GNU Emacs.
;; This file is part of GNU Emacs.
...
@@ -73,11 +73,10 @@ This is only meaningful if you don't use the implicit checkout model
...
@@ -73,11 +73,10 @@ This is only meaningful if you don't use the implicit checkout model
(
defcustom
vc-cvs-stay-local
t
(
defcustom
vc-cvs-stay-local
t
"*Non-nil means use local operations when possible for remote repositories.
"*Non-nil means use local operations when possible for remote repositories.
This avoids slow queries over the network. Turning this option on
This avoids slow queries over the network and instead uses heuristics
will instruct VC to use only heuristics and past information to
and past information to determine the current status of a file.
determine the current status of a file. The value can also be a
The value can also be a regular expression to match against the host name
regular expression to match against the host name of a repository;
of a repository; then VC only stays local for hosts that match it."
then VC only stays local for hosts that match it."
:type
'
(
choice
(
const
:tag
"Always stay local"
t
)
:type
'
(
choice
(
const
:tag
"Always stay local"
t
)
(
string
:tag
"Host regexp"
)
(
string
:tag
"Host regexp"
)
(
const
:tag
"Don't stay local"
nil
))
(
const
:tag
"Don't stay local"
nil
))
...
@@ -209,12 +208,12 @@ special case of a CVS file that is added but not yet committed."
...
@@ -209,12 +208,12 @@ special case of a CVS file that is added but not yet committed."
(
defun
vc-cvs-dired-state-info
(
file
)
(
defun
vc-cvs-dired-state-info
(
file
)
"CVS-specific version of `vc-dired-state-info'."
"CVS-specific version of `vc-dired-state-info'."
(
let*
((
cvs-state
(
vc-state
file
))
(
let*
((
cvs-state
(
vc-state
file
))
(
state
(
cond
((
eq
cvs-state
'edited
)
"modified"
)
(
state
(
cond
((
eq
cvs-state
'edited
)
"modified"
)
((
eq
cvs-state
'needs-patch
)
"patch"
)
((
eq
cvs-state
'needs-patch
)
"patch"
)
((
eq
cvs-state
'needs-merge
)
"merge"
)
((
eq
cvs-state
'needs-merge
)
"merge"
)
;; FIXME: those two states cannot occur right now
;; FIXME: those two states cannot occur right now
((
eq
cvs-state
'unlocked-changes
)
"conflict"
)
((
eq
cvs-state
'unlocked-changes
)
"conflict"
)
((
eq
cvs-state
'locally-added
)
"added"
)
((
eq
cvs-state
'locally-added
)
"added"
)
)))
)))
(
if
state
(
concat
"("
state
")"
))))
(
if
state
(
concat
"("
state
")"
))))
...
@@ -338,7 +337,7 @@ REV is the revision to check out into WORKFILE."
...
@@ -338,7 +337,7 @@ REV is the revision to check out into WORKFILE."
(
apply
'vc-do-command
(
apply
'vc-do-command
(
current-buffer
)
0
"cvs"
file
(
current-buffer
)
0
"cvs"
file
"-Q"
; suppress diagnostic output
"-Q"
; suppress diagnostic output
"update"
"update"
(
and
rev
(
not
(
string=
rev
""
))
(
and
rev
(
not
(
string=
rev
""
))
(
concat
"-r"
rev
))
(
concat
"-r"
rev
))
"-p"
"-p"
...
@@ -356,7 +355,7 @@ REV is the revision to check out into WORKFILE."
...
@@ -356,7 +355,7 @@ REV is the revision to check out into WORKFILE."
(
if
(
and
(
file-exists-p
file
)
(
not
rev
))
(
if
(
and
(
file-exists-p
file
)
(
not
rev
))
;; If no revision was specified, just make the file writable
;; If no revision was specified, just make the file writable
;; if necessary (using `cvs-edit' if requested).
;; if necessary (using `cvs-edit' if requested).
(
and
editable
(
not
(
eq
(
vc-cvs-checkout-model
file
)
'implicit
))
(
and
editable
(
not
(
eq
(
vc-cvs-checkout-model
file
)
'implicit
))
(
if
vc-cvs-use-edit
(
if
vc-cvs-use-edit
(
vc-do-command
nil
0
"cvs"
file
"edit"
)
(
vc-do-command
nil
0
"cvs"
file
"edit"
)
(
set-file-modes
file
(
logior
(
file-modes
file
)
128
))
(
set-file-modes
file
(
logior
(
file-modes
file
)
128
))
...
@@ -364,14 +363,14 @@ REV is the revision to check out into WORKFILE."
...
@@ -364,14 +363,14 @@ REV is the revision to check out into WORKFILE."
;; Check out a particular version (or recreate the file).
;; Check out a particular version (or recreate the file).
(
vc-file-setprop
file
'vc-workfile-version
nil
)
(
vc-file-setprop
file
'vc-workfile-version
nil
)
(
apply
'vc-do-command
nil
0
"cvs"
file
(
apply
'vc-do-command
nil
0
"cvs"
file
(
and
editable
(
and
editable
(
or
(
not
(
file-exists-p
file
))
(
or
(
not
(
file-exists-p
file
))
(
not
(
eq
(
vc-cvs-checkout-model
file
)
(
not
(
eq
(
vc-cvs-checkout-model
file
)
'implicit
)))
'implicit
)))
"-w"
)
"-w"
)
"update"
"update"
;; default for verbose checkout: clear the sticky tag so
;; default for verbose checkout: clear the sticky tag so
;; that the actual update will get the head of the trunk
;; that the actual update will get the head of the trunk
(
if
(
or
(
not
rev
)
(
string=
rev
""
))
(
if
(
or
(
not
rev
)
(
string=
rev
""
))
"-A"
"-A"
(
concat
"-r"
rev
))
(
concat
"-r"
rev
))
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment