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

Add client argument to ‘vc-p4-print-log’

Browse source
This commit is contained in:
Tom Willemse 2021-01-23 10:25:34 -08:00
parent ed30884133
commit 7726d77a94
2 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
p4-lowlevel.el
View file

@ -544,17 +544,18 @@ Returns non-nil on success or nil on failure (or raises an error)."
;; Do NOT need to support "-m".
;; Do NOT need to support the specification of multiple files.
(defun p4-lowlevel-filelog (file &optional buffer long follow-branches limit)
(cl-defun p4-lowlevel-filelog (file &key buffer long follow-branches limit client)
"Fetch the p4 log of FILE and return a buffer containing it.
If optional BUFFER is non-nil, put output in that buffer. If optional
LONG is non-nil, return long output (i.e., pass the `-l' flag). If
optional FOLLOW-BRANCHES is non-nil, include pre-branch log entries in
output (i.e., pass the `-i' flag). If LIMIT is non-nil, get only the
last LIMIT log entries."
(let* ((long-flag (if long (list "-l") nil))
(branch-flag (if follow-branches (list "-i") nil))
(limit-flag (when limit (list "-m" (number-to-string limit))))
(args (append (list "filelog") long-flag branch-flag limit-flag (list file))))
(let* ((long-flag (if long (list "-l")))
(branch-flag (if follow-branches (list "-i")))
(limit-flag (if limit (list "-m" (number-to-string limit))))
(client-args (if client (list "-c" client)))
(args (append client-args (list "filelog") long-flag branch-flag limit-flag (list file))))
(p4-lowlevel-command-into-buffer args (or buffer "log"))))
(cl-defun p4-lowlevel-opened (file &key client)

6
vc-p4.el
View file

@ -430,7 +430,11 @@ comment COMMENT."
(default-directory (file-name-directory file)))
(with-current-buffer
buffer
(p4-lowlevel-filelog file (current-buffer) (not shortlog) nil limit)
(p4-lowlevel-filelog file
:buffer (current-buffer)
:long (not shortlog)
:limit limit
:client vc-p4-client)
;; Insert the file name at the beginning.
(goto-char (point-min))
(insert "File: " (file-name-nondirectory file) "\n"))))