From 2180dc8535f143b468ea299e88aeaa3c5a87a33a Mon Sep 17 00:00:00 2001 From: Tom Willemse Date: Wed, 8 Sep 2021 00:22:54 -0700 Subject: [PATCH] =?UTF-8?q?Replace=20=E2=80=98vc-workfile-version=E2=80=99?= =?UTF-8?q?=20with=20=E2=80=98vc-working-revision=E2=80=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit As far as I can tell there is no ‘vc-workfile-version’ function anywhere. There is a property with that name set on files by vc-p4, but it seems that the function we’re looking for is actually ‘vc-working-revision’. --- vc-p4.el | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/vc-p4.el b/vc-p4.el index f16e66b..b0fe7a8 100644 --- a/vc-p4.el +++ b/vc-p4.el @@ -237,7 +237,7 @@ ignored." Compared to the default implementation, this function handles the special case of a Perforce file that is added but not yet committed." (let ((state (vc-state file)) - (rev (vc-workfile-version file))) + (rev (vc-working-revision file))) (if (or (not rev) (string= rev "0")) (setq rev "@@")) (cond ((or (eq state 'up-to-date) @@ -364,7 +364,7 @@ _CONTENTS-DONE is ignored." ;; If Perforce doesn't believe that we edited the file, we have ;; to use sync instead of revert. (p4-lowlevel-sync file - :rev (vc-workfile-version file) + :rev (vc-working-revision file) :force t)) (t (p4-lowlevel-revert file))) @@ -412,7 +412,7 @@ REV1 and REV2 are the revisions to merge together." "Steal Perforce lock on FILE. VERSION can only be the current version used in the workspace, otherwise this function will raise an error." - (if (and version (not (equal version (vc-workfile-version file)))) + (if (and version (not (equal version (vc-working-revision file)))) (error "Can't specify version when stealing Perforce lock")) ;; Must set default-directory because this is called in a mail send hook and ;; thus not with the current buffer set to the file being reopened.