[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
bug#19045: 25.0.50; [PATCH] vc-git-print-log use --follow
From: |
Juri Linkov |
Subject: |
bug#19045: 25.0.50; [PATCH] vc-git-print-log use --follow |
Date: |
Tue, 20 Feb 2018 22:39:25 +0200 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/27.0.50 (x86_64-pc-linux-gnu) |
>> - (message "Running %s in background..." full-command))
>> + (message "Running in background: %s" full-command))
> ^^
> Extra blank.
>
>> - (message "Running %s in background... done" full-command))))
>> + (let ((message-truncate-lines t))
>> + (message "Finished in background: %s" full-command)))))
>
> I find the original more in line with what we do elsewhere in Emacs.
> If the problem is that "done" could be truncated, then please use
>
> Done in background: %s
Then extra blank is not needed when using “Done in background” because it
would require too many blanks to align with “Finished in background”.
>> - (error "Running %s...FAILED (%s)" full-command
>> - (if (integerp status) (format "status %d" status) status)))
>> + (error "Failed (%s): %s"
>> + (if (integerp status) (format "status %d" status)
>> status)
>> + full-command))
>> (when vc-command-messages
>> - (message "Running %s...OK = %d" full-command status))))
>> + (message "Success (%d): %s" status full-command))))
>
> "Failed" and "Success" don't go together well, as they use different
> grammatical form. How about using "Done" here as well? And won't
> status always be zero when it succeeds? If not, I'd use
I see that the status in case of success is 1.
> Done (status=%d): %s
Done in the following patch:
diff --git a/lisp/vc/vc-dispatcher.el b/lisp/vc/vc-dispatcher.el
index b0d2221..da9d346 100644
--- a/lisp/vc/vc-dispatcher.el
+++ b/lisp/vc/vc-dispatcher.el
@@ -290,16 +290,16 @@ vc-do-command
(let* ((files
(mapcar (lambda (f) (file-relative-name (expand-file-name f)))
(if (listp file-or-list) file-or-list (list file-or-list))))
+ ;; Keep entire commands in *Messages* but avoid resizing the
+ ;; echo area. Messages in this function are formatted in
+ ;; a such way that the important parts are at the beginning,
+ ;; due to potential truncation of long messages.
+ (message-truncate-lines t)
(full-command
- ;; What we're doing here is preparing a version of the command
- ;; for display in a debug-progress message. If it's fewer than
- ;; 20 characters display the entire command (without trailing
- ;; newline). Otherwise display the first 20 followed by an ellipsis.
(concat (if (string= (substring command -1) "\n")
(substring command 0 -1)
command)
- " "
- (vc-delistify (mapcar (lambda (s) (if (> (length s) 20)
(concat (substring s 0 2) "...") s)) flags))
+ " " (vc-delistify flags)
" " (vc-delistify files))))
(save-current-buffer
(unless (or (eq buffer t)
@@ -324,7 +324,7 @@ vc-do-command
(apply 'start-file-process command (current-buffer)
command squeezed))))
(when vc-command-messages
- (message "Running %s in background..." full-command))
+ (message "Running in background: %s" full-command))
;; Get rid of the default message insertion, in case we don't
;; set a sentinel explicitly.
(set-process-sentinel proc #'ignore)
@@ -332,10 +332,11 @@ vc-do-command
(setq status proc)
(when vc-command-messages
(vc-run-delayed
- (message "Running %s in background... done" full-command))))
+ (let ((message-truncate-lines t))
+ (message "Done in background: %s" full-command)))))
;; Run synchronously
(when vc-command-messages
- (message "Running %s in foreground..." full-command))
+ (message "Running in foreground: %s" full-command))
(let ((buffer-undo-list t))
(setq status (apply 'process-file command nil t nil squeezed)))
(when (and (not (eq t okstatus))
@@ -345,13 +346,14 @@ vc-do-command
(pop-to-buffer (current-buffer))
(goto-char (point-min))
(shrink-window-if-larger-than-buffer))
- (error "Running %s...FAILED (%s)" full-command
- (if (integerp status) (format "status %d" status) status)))
+ (error "Failed (%s): %s"
+ (if (integerp status) (format "status %d" status) status)
+ full-command))
(when vc-command-messages
- (message "Running %s...OK = %d" full-command status))))
+ (message "Done (status=%d): %s" status full-command))))
(vc-run-delayed
- (run-hook-with-args 'vc-post-command-functions
- command file-or-list flags))
+ (run-hook-with-args 'vc-post-command-functions
+ command file-or-list flags))
status))))
(defun vc-do-async-command (buffer root command &rest args)
- bug#19045: 25.0.50; [PATCH] vc-git-print-log use --follow, (continued)
- bug#19045: 25.0.50; [PATCH] vc-git-print-log use --follow, Dmitry Gutov, 2018/02/06
- bug#19045: 25.0.50; [PATCH] vc-git-print-log use --follow, Juri Linkov, 2018/02/06
- bug#19045: 25.0.50; [PATCH] vc-git-print-log use --follow, Dmitry Gutov, 2018/02/08
- bug#19045: 25.0.50; [PATCH] vc-git-print-log use --follow, Juri Linkov, 2018/02/10
- bug#19045: 25.0.50; [PATCH] vc-git-print-log use --follow, Dmitry Gutov, 2018/02/11
- bug#19045: 25.0.50; [PATCH] vc-git-print-log use --follow, Juri Linkov, 2018/02/15
- bug#19045: 25.0.50; [PATCH] vc-git-print-log use --follow, Eli Zaretskii, 2018/02/16
- bug#19045: 25.0.50; [PATCH] vc-git-print-log use --follow, Dmitry Gutov, 2018/02/16
- bug#19045: 25.0.50; [PATCH] vc-git-print-log use --follow, Eli Zaretskii, 2018/02/16
- bug#19045: 25.0.50; [PATCH] vc-git-print-log use --follow, Richard Stallman, 2018/02/17
- bug#19045: 25.0.50; [PATCH] vc-git-print-log use --follow,
Juri Linkov <=
- bug#19045: 25.0.50; [PATCH] vc-git-print-log use --follow, Eli Zaretskii, 2018/02/20
bug#19045: 25.0.50; [PATCH] vc-git-print-log use --follow, Eli Zaretskii, 2018/02/04
- bug#19045: 25.0.50; [PATCH] vc-git-print-log use --follow, Juri Linkov, 2018/02/05
- bug#19045: 25.0.50; [PATCH] vc-git-print-log use --follow, Eli Zaretskii, 2018/02/05
- bug#19045: 25.0.50; [PATCH] vc-git-print-log use --follow, Juri Linkov, 2018/02/06
- bug#19045: 25.0.50; [PATCH] vc-git-print-log use --follow, Eli Zaretskii, 2018/02/08
- bug#19045: 25.0.50; [PATCH] vc-git-print-log use --follow, Juri Linkov, 2018/02/08
- bug#19045: 25.0.50; [PATCH] vc-git-print-log use --follow, Eli Zaretskii, 2018/02/09
bug#19045: 25.0.50; [PATCH] vc-git-print-log use --follow, Eli Zaretskii, 2018/02/10