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

Replace ‘vc-workfile-version’ with ‘vc-working-revision’

Browse source 
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’.
This commit is contained in:
Tom Willemse 2021-09-08 00:22:54 -07:00
parent b5c4732eb4
commit 2180dc8535
Signed by: ryuslash
GPG key ID: 7D5C407B435025C1
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
vc-p4.el
View file

@ -237,7 +237,7 @@ ignored."
Compared to the default implementation, this function handles the Compared to the default implementation, this function handles the
special case of a Perforce file that is added but not yet committed." special case of a Perforce file that is added but not yet committed."
(let ((state (vc-state file)) (let ((state (vc-state file))
(rev (vc-workfile-version file))) (rev (vc-working-revision file)))
(if (or (not rev) (string= rev "0")) (if (or (not rev) (string= rev "0"))
(setq rev "@@")) (setq rev "@@"))
(cond ((or (eq state 'up-to-date) (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 ;; If Perforce doesn't believe that we edited the file, we have
;; to use sync instead of revert. ;; to use sync instead of revert.
(p4-lowlevel-sync file (p4-lowlevel-sync file
:rev (vc-workfile-version file) :rev (vc-working-revision file)
:force t)) :force t))
(t (t
(p4-lowlevel-revert file))) (p4-lowlevel-revert file)))
@ -412,7 +412,7 @@ REV1 and REV2 are the revisions to merge together."
"Steal Perforce lock on FILE. "Steal Perforce lock on FILE.
VERSION can only be the current version used in the workspace, VERSION can only be the current version used in the workspace,
otherwise this function will raise an error." 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")) (error "Can't specify version when stealing Perforce lock"))
;; Must set default-directory because this is called in a mail send hook and ;; 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. ;; thus not with the current buffer set to the file being reopened.