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

fix: vc-p4 doesn't recognize a file in its client because of case

Browse source 
When checking to see if a file is within a Perforce client, match the root
directory and current directory as reported by Perforce and ignore case
differences.

Sometimes (at least on Windows) the current directory and the client root can
point at the same directory, but because of the way Perforce creates directories
and files the case might differ.
This commit is contained in:
Tom Willemse 2023-04-03 22:57:23 -07:00
parent 43c4b8fa56
commit 0637cddd58
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
vc-p4.el
View file

@ -930,7 +930,7 @@ If DIRNAME is not specified, uses `default-directory'."
(info (p4-lowlevel-info)) (info (p4-lowlevel-info))
(root (alist-get "Client root" info nil nil #'string=)) (root (alist-get "Client root" info nil nil #'string=))
(cwd (alist-get "Current directory" info nil nil #'string=))) (cwd (alist-get "Current directory" info nil nil #'string=)))
(string-prefix-p root cwd))) (string-prefix-p root cwd t)))
(defun vc-p4-has-unresolved-conflicts-p (file) (defun vc-p4-has-unresolved-conflicts-p (file)
"Search through FILE's buffer for unresolved P4 conflicts. "Search through FILE's buffer for unresolved P4 conflicts.