From a9bf4c10ad577ea32d50cbe72b55d6bb6e7eaed4 Mon Sep 17 00:00:00 2001 From: Tom Willemse Date: Sat, 23 Jan 2021 10:30:34 -0800 Subject: [PATCH] =?UTF-8?q?Add=20client=20arg=20to=20=E2=80=98vc-p4-update?= =?UTF-8?q?-changelog=E2=80=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- p4-lowlevel.el | 7 +++++-- vc-p4.el | 8 ++++++-- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/p4-lowlevel.el b/p4-lowlevel.el index 28dff84..68e5b31 100644 --- a/p4-lowlevel.el +++ b/p4-lowlevel.el @@ -428,7 +428,8 @@ buffer is returned." (insert (p4-lowlevel-info-lines alist)) buffer)))) -(defun p4-lowlevel-changes (file-pattern &optional output-format rev1 rev2 i-flag l-flag m-val s-val) +(cl-defun p4-lowlevel-changes + (file-pattern &key output-format rev1 rev2 i-flag l-flag m-val s-val client) "Call `p4 changes' on FILE-PATTERN. Optional OUTPUT-FORMAT is as described in `p4-lowlevel-command-or-error'. Optionally, limit output to the revisions between REV1 and REV2. If I-FLAG is non-nil, pass @@ -445,8 +446,10 @@ value with `-m'; if S-VAL is non-nil, pass that value with `-s'." (m-list (if m-val (list "-m" (if (numberp m-val) (number-to-string m-val) m-val)))) - (s-list (if s-val (list "-s" s-val)))) + (s-list (if s-val (list "-s" s-val))) + (client-args (if client (list "-c" client)))) (p4-lowlevel-command-or-error (append + client-args (list "changes") i-list l-list m-list s-list (list full-file)) diff --git a/vc-p4.el b/vc-p4.el index a95e9de..83eef69 100644 --- a/vc-p4.el +++ b/vc-p4.el @@ -496,8 +496,12 @@ files under the default directory otherwise." (setq files "...")) (message "Computing change log entries...") (insert (p4-lowlevel-info-lines - (p4-lowlevel-changes files nil start-rev end-rev - nil t nil "submitted"))) + (p4-lowlevel-changes files + :rev1 start-rev + :rev2 end-rev + :l-flag t + :s-val "submitted" + :client vc-p4-client))) (if (= (point) (point-min)) t (if (not (= (point) (point-max))) (insert "\n"))