Fix issue with files showing as needs-update in vc-dir

Files that have move/delete as their head action would show up as needing
updates in vc-dir.
This commit is contained in:
Tom Willemse 2022-03-14 23:47:29 -07:00
parent f48d5b449c
commit 2beff7d468
2 changed files with 7 additions and 1 deletions

View file

@ -32,6 +32,10 @@ Specifically the Server, root directory, client, and stream are shown in the hea
This shows whether the file is binary, or text, and whether it has the lock, modification time, etc. modifiers enabled. This shows whether the file is binary, or text, and whether it has the lock, modification time, etc. modifiers enabled.
** FIXED An issue with files with move/delete as their head action showing in vc-dir
vc-p4 didn't understand that move/delete was a thing, so it assumed that it meant the same as needs-update
* 0.2.1 -- 2020-05-27 * 0.2.1 -- 2020-05-27
** FIXED Recognition of sub-directories of Perforce repos ** FIXED Recognition of sub-directories of Perforce repos

View file

@ -165,7 +165,9 @@ compare non-open files to the depot version."
'unlocked-changes) 'unlocked-changes)
((or ((or
(equal headRev haveRev) (equal headRev haveRev)
(and (null haveRev) (string= headAction "delete"))) (and (null haveRev)
(or (string= headAction "delete")
(string= headAction "move/delete"))))
'up-to-date) 'up-to-date)
(t (t
'needs-update)))) 'needs-update))))