From 43c4b8fa56ae880abcfbbaff3e44b353757c8582 Mon Sep 17 00:00:00 2001 From: Tom Willemse Date: Mon, 3 Apr 2023 22:53:23 -0700 Subject: [PATCH] =?UTF-8?q?fix:=20=E2=80=98vc-ediff=E2=80=99=20thinks=20ev?= =?UTF-8?q?erything=20in=20all=20files=20has=20changed?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Calling ‘p4-lowlevel-command-or-error’ on a buffer will output the raw response from Perforce, which includes tags like ‘text:’ and ‘exit:’ at the start of each line. These tags are used by the low-level functions to find the right data and figure out if the given command succeeded or not. Using ‘p4-lowlevel-command-into-buffer’ should have the desired behaviour of cutting out all the tags and showing only the actual contents of the response. This will make sure that the “other” buffer doesn't display all lines have changed because suddenly each line starts with a tag. --- p4-lowlevel.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/p4-lowlevel.el b/p4-lowlevel.el index c1aeeb3..70c04d6 100644 --- a/p4-lowlevel.el +++ b/p4-lowlevel.el @@ -626,7 +626,7 @@ then the `-q' flag is passed to `p4 print'." (let* ((fullfile (if rev (concat file rev) file)) (quiet-args (if quiet (list "-q"))) (args (append (list "print") quiet-args (list fullfile)))) - (p4-lowlevel-command-or-error args nil output-format))) + (p4-lowlevel-command-into-buffer args output-format))) ;; Here's what we need to support from the "p4 reopen" command, at least for the ;; time being: