From 5c078b4c12878b79dfcc881c18bb0c3810d3f5c7 Mon Sep 17 00:00:00 2001 From: Magnus Henoch Date: Wed, 27 May 2009 06:08:50 -0800 Subject: [PATCH] (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] --- p4-lowlevel.el | 2 ++ 1 file changed, 2 insertions(+) diff --git a/p4-lowlevel.el b/p4-lowlevel.el index ea3c2c1..4b816e2 100644 --- a/p4-lowlevel.el +++ b/p4-lowlevel.el @@ -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)))