(p4-lowlevel-diff): Handle diff of directories.
[git-p4: depot-paths = "//guest/Ben_Key/vc-p4/,//guest/jonathan_kamens/vc-p4/,//guest/magnus_henoch/vc-p4/": change = 7233]
This commit is contained in:
parent
1391eebeb5
commit
5c078b4c12
1 changed files with 2 additions and 0 deletions
|
@ -421,6 +421,8 @@ the file on disk. Uses `p4-lowlevel-diff-switches' to determine flags
|
|||
to pass to `p4 diff'. If optional BUFFER is non-nil, put output in
|
||||
that buffer."
|
||||
(setq rev (p4-lowlevel-canonicalize-revision rev))
|
||||
(when (file-directory-p file)
|
||||
(setq file (concat file "/...")))
|
||||
(let* ((file-spec (if rev (concat file rev) file))
|
||||
(diff-args (append (list "diff") p4-lowlevel-diff-switches
|
||||
(list "-f" "-t" file-spec)))
|
||||
|
|
Loading…
Reference in a new issue