diff options
| author | Wolfgang Scherer <wolfgang.scherer@gmx.de> | 2020-02-21 21:28:11 +0100 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2020-02-22 10:52:07 +0200 |
| commit | 0273f261a71089e5fea3cbfc45a654e508e49497 (patch) | |
| tree | 7763174437c53370e2da85a2ecf4cf8f61737468 /lisp/vc/pcvs.el | |
| parent | d7c22338d2d461e0b55a6628fed1917c08715292 (diff) | |
| download | emacs-0273f261a71089e5fea3cbfc45a654e508e49497.tar.gz | |
Don't write absolute filenames and duplicate strings to CVS ignore files
* lisp/vc/vc-cvs.el (vc-cvs-ignore): Expand filename correctly
and pass on only the basename as the pattern.
(vc-cvs-append-to-ignore) Do not write duplicate strings to
.cvsignore. New optional parameter SORT to more explicitly
control sorting of the ignore entries. (Bug#37215)
* lisp/vc/pcvs.el (cvs-mode-ignore): Call 'vc-cvs-append-to-ignore'
with SORT argument.
Diffstat (limited to 'lisp/vc/pcvs.el')
| -rw-r--r-- | lisp/vc/pcvs.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/vc/pcvs.el b/lisp/vc/pcvs.el index dcba504401c..cb0494ee91c 100644 --- a/lisp/vc/pcvs.el +++ b/lisp/vc/pcvs.el @@ -106,7 +106,6 @@ ;; right now, it's killed without further ado. ;; - make `cvs-mode-ignore' allow manually entering a pattern. ;; to which dir should it apply ? -;; - cvs-mode-ignore should try to remove duplicate entries. ;; - maybe poll/check CVS/Entries files to react to external `cvs' commands ? ;; - some kind of `cvs annotate' support ? ;; but vc-annotate can be used instead. @@ -1972,7 +1971,8 @@ This command ignores files that are not flagged as `Unknown'." (interactive) (dolist (fi (cvs-mode-marked 'ignore)) (vc-cvs-append-to-ignore (cvs-fileinfo->dir fi) (cvs-fileinfo->file fi) - (eq (cvs-fileinfo->subtype fi) 'NEW-DIR)) + (eq (cvs-fileinfo->subtype fi) 'NEW-DIR) + cvs-sort-ignore-file) (setf (cvs-fileinfo->type fi) 'DEAD)) (cvs-cleanup-collection cvs-cookies nil nil nil)) |