mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git.el: Improve the confirmation message on remove and revert.

Browse Source 
If there's only one file, print its name instead of just "1 file".

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Alexandre Julliard
2009-02-16 11:40:08 +01:00
parent 21ba0e8435
commit 5b4e44104e
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
contrib/emacs/git.el
View File

@ -1068,7 +1068,9 @@ The FILES list must be sorted."
(unless files (unless files
(push (file-relative-name (read-file-name "File to remove: " nil nil t)) files)) (push (file-relative-name (read-file-name "File to remove: " nil nil t)) files))
(if (yes-or-no-p (if (yes-or-no-p
(format "Remove %d file%s? " (length files) (if (> (length files) 1) "s" ""))) (if (cdr files)
(format "Remove %d files? " (length files))
(format "Remove %s? " (car files))))
(progn (progn
(dolist (name files) (dolist (name files)
(ignore-errors (ignore-errors
@ -1087,7 +1089,9 @@ The FILES list must be sorted."
added modified) added modified)
(when (and files (when (and files
(yes-or-no-p (yes-or-no-p
(format "Revert %d file%s? " (length files) (if (> (length files) 1) "s" "")))) (if (cdr files)
(format "Revert %d files? " (length files))
(format "Revert %s? " (git-fileinfo->name (car files))))))
(dolist (info files) (dolist (info files)
(case (git-fileinfo->state info) (case (git-fileinfo->state info)
('added (push (git-fileinfo->name info) added)) ('added (push (git-fileinfo->name info) added))