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

* vc-p4.el (vc-p4-state): Change if' mess to cond'.

Browse source 
[git-p4: depot-paths = "//guest/Ben_Key/vc-p4/,//guest/jonathan_kamens/vc-p4/,//guest/magnus_henoch/vc-p4/": change = 7361]
This commit is contained in:
Magnus Henoch 2009-08-27 04:18:55 -08:00
parent 7292914d99
commit c24b959ed3
1 changed files with 16 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
vc-p4.el
View file

@ -132,19 +132,22 @@ compare non-open files to the depot version."
(haveRev (cdr (assoc "haveRev" alist)))
(depotFile (cdr (assoc "depotFile" alist)))
(action (cdr (assoc "action" alist)))
(state (if action
(state
(cond
(action
(let ((opened (p4-lowlevel-opened file)))
(if (string-match " by \\([^@]+\\)@" opened)
(match-string 1 opened)
(if (equal headRev haveRev)
'edited
'needs-merge)))
(if (and (not dont-compare-nonopened)
'needs-merge))))
((and (not dont-compare-nonopened)
(p4-lowlevel-diff-s file "e"))
'unlocked-changes
(if (equal headRev haveRev)
'up-to-date
'needs-patch))))
'unlocked-changes)
((equal headRev haveRev)
'up-to-date)
(t
'needs-patch)))
)
(vc-file-setprop file 'vc-p4-did-fstat t)
(vc-file-setprop file 'vc-p4-depot-file depotFile)