ryuslash/vc-p4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix indentation

Browse source
This commit is contained in:
Tom Willemse 2017-06-07 12:34:06 -07:00
parent 94077d5136
commit d53eb68743
1 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
vc-p4.el
View file

@ -77,7 +77,7 @@
(put 'P4 'vc-functions nil) (put 'P4 'vc-functions nil)
(defcustom vc-p4-require-p4config nil (defcustom vc-p4-require-p4config nil
"*If non-nil and the `P4CONFIG' environment variable is set, then "If non-nil and the `P4CONFIG' environment variable is set, then
only perform p4 operations on a file when a P4CONFIG file can be found only perform p4 operations on a file when a P4CONFIG file can be found
in one of its parent directories. This is useful if P4 operations are in one of its parent directories. This is useful if P4 operations are
expensive to start, e.g., if you are connect to the network over a expensive to start, e.g., if you are connect to the network over a
@ -110,19 +110,19 @@ Perforce has per-file revisions."
(defun vc-p4-registered (file) (defun vc-p4-registered (file)
"Return non-nil is FILE is handled by Perforce." "Return non-nil is FILE is handled by Perforce."
(if (p4-lowlevel-locate-p4) (if (p4-lowlevel-locate-p4)
(if (and vc-p4-require-p4config (if (and vc-p4-require-p4config
(getenv "P4CONFIG") (getenv "P4CONFIG")
(not (vc-p4-find-p4config (file-name-directory file)))) (not (vc-p4-find-p4config (file-name-directory file))))
nil nil
(let* ((fstat (p4-lowlevel-fstat file nil t)) (let* ((fstat (p4-lowlevel-fstat file nil t))
(action (cdr (or (assoc "action" fstat) (action (cdr (or (assoc "action" fstat)
(assoc "headAction" fstat))))) (assoc "headAction" fstat)))))
(if (or (not fstat) (if (or (not fstat)
(string= action "delete")) (string= action "delete"))
nil nil
; This sets a bunch of VC properties ;; This sets a bunch of VC properties
(vc-p4-state file fstat) (vc-p4-state file fstat)
t))))) t)))))
(defun vc-p4-state (file &optional fstat-list force dont-compare-nonopened) (defun vc-p4-state (file &optional fstat-list force dont-compare-nonopened)
"Returns the current version control state of FILE in Perforce. "Returns the current version control state of FILE in Perforce.