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

181
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.
@ -367,12 +358,12 @@ commands."
(concat "@" rev) (concat "@" rev)
rev)))))) rev))))))
; Here's what we need to support from the "p4 add" command, at least ; Here's what we need to support from the "p4 add" command, at least
; for the time being: ; for the time being:
; ;
; Do NOT need to support "-c". ; Do NOT need to support "-c".
; Do NOT need to support "-t". ; Do NOT need to support "-t".
; Do NOT need to support the specification of multiple files. ; Do NOT need to support the specification of multiple files.
(defun p4-lowlevel-add (file) (defun p4-lowlevel-add (file)
"Tell Perforce to add FILE to the repository. "Tell Perforce to add FILE to the repository.
@ -382,14 +373,14 @@ Returns nil or raises an error on failure."
; an attempt to add a file which already exists in the repository. ; an attempt to add a file which already exists in the repository.
(p4-lowlevel-command-or-error (list "add" file))) (p4-lowlevel-command-or-error (list "add" file)))
; Here's what we need to support from the "p4 change" command, at ; Here's what we need to support from the "p4 change" command, at
; least for the time being: ; least for the time being:
; ;
; Do NOT need to support "-f". ; Do NOT need to support "-f".
; Do NOT need to support "-d". ; Do NOT need to support "-d".
; DO need to support "-o". ; DO need to support "-o".
; DO need to support "-i". ; DO need to support "-i".
; DO need to support specified changelist #'s. ; DO need to support specified changelist #'s.
(defun p4-lowlevel-change (&optional buffer op) (defun p4-lowlevel-change (&optional buffer op)
"Creates or edits a P4 changelist from/to BUFFER. "Creates or edits a P4 changelist from/to BUFFER.
@ -444,15 +435,15 @@ value with `-m'; if S-VAL is non-nil, pass that value with `-s'."
(list full-file)) (list full-file))
nil output-format))) nil output-format)))
; Here's what we need to support from the "p4 diff" command, at ; Here's what we need to support from the "p4 diff" command, at
; least for the time being: ; least for the time being:
; ;
; DO need to support "-d<flag>". ; DO need to support "-d<flag>".
; DO need to support "-f" (in fact, need to specify it all the time). ; DO need to support "-f" (in fact, need to specify it all the time).
; Do NOT need to support "-s<flag>". ; Do NOT need to support "-s<flag>".
; DO need to support "-t" (in fact, need to specify it all the time). ; DO need to support "-t" (in fact, need to specify it all the time).
; DO need to support diffing a single file. ; DO need to support diffing a single file.
; Do NOT need to support diffing multiple files. ; Do NOT need to support diffing multiple files.
(defun p4-lowlevel-diff (files &optional rev buffer) (defun p4-lowlevel-diff (files &optional rev buffer)
"Run `p4 diff' on FILE at revision REV and return a buffer "Run `p4 diff' on FILE at revision REV and return a buffer
@ -490,13 +481,13 @@ return a list of the matching files."
(format "-s%s" flag) (format "-s%s" flag)
file)))) file))))
; Here's what we need to support from the "p4 diff2" command, at least ; Here's what we need to support from the "p4 diff2" command, at least
; for the time being: ; for the time being:
; ;
; DO need to support "-d<flag>". ; DO need to support "-d<flag>".
; Do NOT need to support "-q". ; Do NOT need to support "-q".
; DO need to support "-t" (in fact, need to specify it all the time). ; DO need to support "-t" (in fact, need to specify it all the time).
; Do NOT need to support "-b". ; Do NOT need to support "-b".
(defun p4-lowlevel-diff2 (file1 file2 &optional rev1 rev2 buffer) (defun p4-lowlevel-diff2 (file1 file2 &optional rev1 rev2 buffer)
"Run `p4 diff2' on FILE and FILE2 and return a buffer containing the "Run `p4 diff2' on FILE and FILE2 and return a buffer containing the
@ -514,25 +505,25 @@ optional BUFFER is non-nil, output goes in that buffer. Uses
(or buffer "diff")))) (or buffer "diff"))))
buffer)) buffer))
; Here's what we need to support from the "p4 edit" command, at least ; Here's what we need to support from the "p4 edit" command, at least
; for the time being: ; for the time being:
; ;
; Do NOT need to support "-c". ; Do NOT need to support "-c".
; Do NOT need to support "-t". ; Do NOT need to support "-t".
; Do NOT need to support the specification of multiple files. ; Do NOT need to support the specification of multiple files.
(defun p4-lowlevel-edit (file) (defun p4-lowlevel-edit (file)
"Tell Perforce we want to edit FILE. "Tell Perforce we want to edit FILE.
Returns non-nil on success or nil on failure (or raises an error)." Returns non-nil on success or nil on failure (or raises an error)."
(p4-lowlevel-command-or-error (list "edit" file))) (p4-lowlevel-command-or-error (list "edit" file)))
; Here's what we need to support from the "p4 filelog" command, at ; Here's what we need to support from the "p4 filelog" command, at
; least for the time being: ; least for the time being:
; ;
; DO need to support "-i". ; DO need to support "-i".
; DO need to support "-l". ; DO need to support "-l".
; Do NOT need to support "-m". ; Do NOT need to support "-m".
; Do NOT need to support the specification of multiple files. ; Do NOT need to support the specification of multiple files.
(defun p4-lowlevel-filelog (file &optional buffer long follow-branches limit) (defun p4-lowlevel-filelog (file &optional buffer long follow-branches limit)
"Fetch the p4 log of FILE and return a buffer containing it. "Fetch the p4 log of FILE and return a buffer containing it.
@ -551,11 +542,11 @@ last LIMIT log entries."
"Fetch the string returned by running `p4 opened' on FILE." "Fetch the string returned by running `p4 opened' on FILE."
(p4-lowlevel-command-or-error (list "opened" file) nil 'string)) (p4-lowlevel-command-or-error (list "opened" file) nil 'string))
; Here's what we need to support from the "p4 fstat" command, at least ; Here's what we need to support from the "p4 fstat" command, at least
; for the time being: ; for the time being:
; ;
; Do NOT need to support any command-line switches. ; Do NOT need to support any command-line switches.
; Do NOT need to support the specification of multiple files. ; Do NOT need to support the specification of multiple files.
(defun p4-lowlevel-fstat (file &optional rev noerror) (defun p4-lowlevel-fstat (file &optional rev noerror)
"Fetch p4 information about FILE (optionally, at REV). "Fetch p4 information about FILE (optionally, at REV).
@ -618,13 +609,13 @@ QUIET is non-nil, then the `-q' flag is passed to `p4 print'."
(args (append (list "print") quiet-args (list fullfile)))) (args (append (list "print") quiet-args (list fullfile))))
(p4-lowlevel-command-or-error args nil output-format))) (p4-lowlevel-command-or-error args nil output-format)))
; Here's what we need to support from the "p4 reopen" command, at ; Here's what we need to support from the "p4 reopen" command, at
; least for the time being: ; least for the time being:
; ;
; DO need to support "-c changelist#", so that we can reopen a file in ; DO need to support "-c changelist#", so that we can reopen a file in
; the default changelist before submitting it. ; the default changelist before submitting it.
; Do NOT need to support "-t". ; Do NOT need to support "-t".
; Do NOT need to support the specification of multiple files. ; Do NOT need to support the specification of multiple files.
(defun p4-lowlevel-reopen (file &optional changelist) (defun p4-lowlevel-reopen (file &optional changelist)
"Call `p4 reopen' on FILE. "Call `p4 reopen' on FILE.
@ -633,16 +624,16 @@ Optional CHANGELIST specifies the changelist to which to move it."
(if changelist (list "-c" changelist) nil) (if changelist (list "-c" changelist) nil)
(list file)))) (list file))))
; Here's what we need to support from the "p4 resolve" command, at ; Here's what we need to support from the "p4 resolve" command, at
; least for the time being: ; least for the time being:
; ;
; DO need to support "-af" (in fact, need to specify it all the time). ; DO need to support "-af" (in fact, need to specify it all the time).
; Do NOT need to support "-am", "-as", "-at", "-ay". ; Do NOT need to support "-am", "-as", "-at", "-ay".
; Do NOT need to support "-f". ; Do NOT need to support "-f".
; Do NOT need to support "-n". ; Do NOT need to support "-n".
; DO need to support "-t" (in fact, need to specify it all the time). ; DO need to support "-t" (in fact, need to specify it all the time).
; Do NOT need to support "-v". ; Do NOT need to support "-v".
; Do NOT need to support the specification of multiple files. ; Do NOT need to support the specification of multiple files.
(defun p4-lowlevel-resolve (file) (defun p4-lowlevel-resolve (file)
"Call `p4 resolve' on FILE. "Call `p4 resolve' on FILE.
@ -650,22 +641,22 @@ Specifies the `-af' and `-t' options to ensure a non-interactive
resolve. Raises an error if the command fails." resolve. Raises an error if the command fails."
(p4-lowlevel-command-or-error (list "resolve" "-af" "-t" file))) (p4-lowlevel-command-or-error (list "resolve" "-af" "-t" file)))
; Here's what we need to support from the "p4 revert" command, at ; Here's what we need to support from the "p4 revert" command, at
; least for the time being: ; least for the time being:
; ;
; Do NOT need to support "-a". ; Do NOT need to support "-a".
; Do NOT need to support "-c". ; Do NOT need to support "-c".
; Do NOT need to support the specification of multiple files. ; Do NOT need to support the specification of multiple files.
(defun p4-lowlevel-revert (file) (defun p4-lowlevel-revert (file)
"Tell Perforce to unedit FILE." "Tell Perforce to unedit FILE."
(p4-lowlevel-command-or-error (list "revert" file))) (p4-lowlevel-command-or-error (list "revert" file)))
; Here's what we need to support from the "p4 submit" command, at ; Here's what we need to support from the "p4 submit" command, at
; least for the time being: ; least for the time being:
; ;
; Only need to support non-interactive use; therefore, only need to ; Only need to support non-interactive use; therefore, only need to
; support "p4 submit -i". ; support "p4 submit -i".
(defun p4-lowlevel-submit (change-spec) (defun p4-lowlevel-submit (change-spec)
"Calls `p4 submit' on CHANGE-SPEC, which should be a string or buffer." "Calls `p4 submit' on CHANGE-SPEC, which should be a string or buffer."
@ -680,13 +671,13 @@ resolve. Raises an error if the command fails."
(insert change-spec))) (insert change-spec)))
(p4-lowlevel-command-or-error (list "submit" "-i") buffer))) (p4-lowlevel-command-or-error (list "submit" "-i") buffer)))
; Here's what we need to support from the "p4 sync" command, at least ; Here's what we need to support from the "p4 sync" command, at least
; for the time being: ; for the time being:
; ;
; DO need to support "-f". ; DO need to support "-f".
; Do NOT need to support "-n". ; Do NOT need to support "-n".
; DO need to support the specification of a file revision. ; DO need to support the specification of a file revision.
; Do NOT need to support the specification of multiple files. ; Do NOT need to support the specification of multiple files.
(defun p4-lowlevel-sync (file &optional rev force) (defun p4-lowlevel-sync (file &optional rev force)
"Call `p4 sync' for FILE. "Call `p4 sync' for FILE.

15
vc-p4.el
View file

@ -72,8 +72,8 @@
(if (not (memq 'P4 vc-handled-backends)) (if (not (memq 'P4 vc-handled-backends))
(setq vc-handled-backends (cons 'P4 vc-handled-backends))) (setq vc-handled-backends (cons 'P4 vc-handled-backends)))
; This is useful during development to ensure that we can simply ; This is useful during development to ensure that we can simply
; reeval this buffer to get any new functions that have been added. ; reeval this buffer to get any new functions that have been added.
(put 'P4 'vc-functions nil) (put 'P4 'vc-functions nil)
(defcustom vc-p4-require-p4config nil (defcustom vc-p4-require-p4config nil
@ -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
@ -732,12 +729,12 @@ Optional arg VERSION is a version to annotate from."
(cons (cons
(cons ch (list rev date author cur-file)) ch-alist)) (cons ch (list rev date author cur-file)) ch-alist))
(if (not head-rev) (setq head-rev rev)) (if (not head-rev) (setq head-rev rev))
(setq headseen t)) )) (setq headseen t))))
;; not if we have entered a branch (this used to be used, isn't ;; not if we have entered a branch (this used to be used, isn't
;; right now - maybe again later: ;; right now - maybe again later:
(if (and headseen (looking-at blame-branch-regex)) (if (and headseen (looking-at blame-branch-regex))
(setq branch-p t)) ) (setq branch-p t)))
(forward-line)))) (forward-line))))
(if (< (length ch-alist) 1) (if (< (length ch-alist) 1)