* vc-p4.el (vc-p4-state): Display files present neither on client
nor in depot head as `up-to-date'. [git-p4: depot-paths = "//guest/Ben_Key/vc-p4/,//guest/jonathan_kamens/vc-p4/,//guest/magnus_henoch/vc-p4/": change = 7362]
This commit is contained in:
parent
c24b959ed3
commit
d4562f9ba7
1 changed files with 4 additions and 1 deletions
5
vc-p4.el
5
vc-p4.el
|
@ -132,6 +132,7 @@ compare non-open files to the depot version."
|
||||||
(haveRev (cdr (assoc "haveRev" alist)))
|
(haveRev (cdr (assoc "haveRev" alist)))
|
||||||
(depotFile (cdr (assoc "depotFile" alist)))
|
(depotFile (cdr (assoc "depotFile" alist)))
|
||||||
(action (cdr (assoc "action" alist)))
|
(action (cdr (assoc "action" alist)))
|
||||||
|
(headAction (cdr (assoc "headAction" alist)))
|
||||||
(state
|
(state
|
||||||
(cond
|
(cond
|
||||||
(action
|
(action
|
||||||
|
@ -144,7 +145,9 @@ compare non-open files to the depot version."
|
||||||
((and (not dont-compare-nonopened)
|
((and (not dont-compare-nonopened)
|
||||||
(p4-lowlevel-diff-s file "e"))
|
(p4-lowlevel-diff-s file "e"))
|
||||||
'unlocked-changes)
|
'unlocked-changes)
|
||||||
((equal headRev haveRev)
|
((or
|
||||||
|
(equal headRev haveRev)
|
||||||
|
(and (null haveRev) (string= headAction "delete")))
|
||||||
'up-to-date)
|
'up-to-date)
|
||||||
(t
|
(t
|
||||||
'needs-patch)))
|
'needs-patch)))
|
||||||
|
|
Loading…
Reference in a new issue