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

Fix whitespace

Browse source
This commit is contained in:
Tom Willemse 2017-06-07 00:03:49 -07:00
parent 3cb296d970
commit e7a25a4fda
2 changed files with 455 additions and 467 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
p4-lowlevel.el
View file

@ -69,9 +69,7 @@ a portion of the error string you wish to ignore."
avoid an error on systems on which the Perforce client is not installed." avoid an error on systems on which the Perforce client is not installed."
(if (and (boundp 'exec-suffixes) (fboundp 'file-executable-p)) (if (and (boundp 'exec-suffixes) (fboundp 'file-executable-p))
(locate-file p4-lowlevel-p4-program exec-path exec-suffixes 'file-executable-p) ; GNU Emacs (locate-file p4-lowlevel-p4-program exec-path exec-suffixes 'file-executable-p) ; GNU Emacs
(locate-file p4-lowlevel-p4-program exec-path '("" ".btm" ".bat" ".cmd" ".exe" ".com") 'executable) ; XEmacs (locate-file p4-lowlevel-p4-program exec-path '("" ".btm" ".bat" ".cmd" ".exe" ".com") 'executable))) ; XEmacs
)
)
(defun p4-lowlevel-command-to-buffer (args &optional input output) (defun p4-lowlevel-command-to-buffer (args &optional input output)
"Call `p4-lowlevel-p4-command' with specified list of ARGS. "Call `p4-lowlevel-p4-command' with specified list of ARGS.
@ -213,15 +211,8 @@ the return value of `p4-lowlevel-command-to-buffer' on failure."
(progn (progn
(setq should-ignore t) (setq should-ignore t)
(if p4-lowlevel-command-messages (if p4-lowlevel-command-messages
(message "Ignoring error: %s" error-string) (message "Ignoring error: %s" error-string))))))
) nil))
)
)
)
)
nil
)
)
(defun p4-lowlevel-successful-alist-p (output) (defun p4-lowlevel-successful-alist-p (output)
"Determines if OUTPUT, a buffer or alist, is from a successful p4 command. "Determines if OUTPUT, a buffer or alist, is from a successful p4 command.

7
vc-p4.el
View file

@ -99,7 +99,6 @@ specify a starting date when you run C-u C-x v g."
:type 'string :type 'string
:group 'vc) :group 'vc)
(defun vc-p4-create-repo () (defun vc-p4-create-repo ()
(error "create-repo not supported yet for P4")) (error "create-repo not supported yet for P4"))
@ -158,8 +157,7 @@ compare non-open files to the depot version."
(and (null haveRev) (string= headAction "delete"))) (and (null haveRev) (string= headAction "delete")))
'up-to-date) 'up-to-date)
(t (t
'needs-patch))) 'needs-patch))))
)
(vc-file-setprop file 'vc-p4-did-fstat t) (vc-file-setprop file 'vc-p4-did-fstat t)
(vc-file-setprop file 'vc-p4-depot-file depotFile) (vc-file-setprop file 'vc-p4-depot-file depotFile)
(vc-file-setprop file 'vc-p4-action action) (vc-file-setprop file 'vc-p4-action action)
@ -686,8 +684,7 @@ Optional arg VERSION is a version to annotate from."
(save-excursion (save-excursion
;; (set-buffer buffer) ;; (set-buffer buffer)
(if (> (count-lines (point-min) (point-max)) 1) (if (> (count-lines (point-min) (point-max)) 1)
(error "File pattern maps to more than one file."))) (error "File pattern maps to more than one file."))))
)
;; get the file change history: ;; get the file change history:
;;(p4-exec-p4 buffer (list "filelog" "-i" file-spec) t) ;;(p4-exec-p4 buffer (list "filelog" "-i" file-spec) t)
(with-temp-buffer (with-temp-buffer