diff options
| author | Wolfgang Scherer | 2019-10-07 06:58:59 +0200 |
|---|---|---|
| committer | Lars Ingebrigtsen | 2019-10-07 08:15:22 +0200 |
| commit | 604a985a1a1066679895d2ec80c7b351ecbf8ff4 (patch) | |
| tree | a2abf61374a20e4fb45dba042c8957cac9af1616 | |
| parent | f2346b5788338dbceabc30233234e4a3308f32c2 (diff) | |
| download | emacs-604a985a1a1066679895d2ec80c7b351ecbf8ff4.tar.gz emacs-604a985a1a1066679895d2ec80c7b351ecbf8ff4.zip | |
Set correct svn:ignore property for relative filenames
* lisp/vc/vc-svn.el: (vc-svn-ignore) Use svn:ignore property of
immediate parent directory for wildcard specification (bug#37216).
| -rw-r--r-- | lisp/vc/vc-svn.el | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/lisp/vc/vc-svn.el b/lisp/vc/vc-svn.el index 88a280d10f3..942dbd5fa5a 100644 --- a/lisp/vc/vc-svn.el +++ b/lisp/vc/vc-svn.el | |||
| @@ -353,15 +353,18 @@ to the SVN command." | |||
| 353 | 353 | ||
| 354 | (defun vc-svn-ignore (file &optional directory remove) | 354 | (defun vc-svn-ignore (file &optional directory remove) |
| 355 | "Ignore FILE under Subversion. | 355 | "Ignore FILE under Subversion. |
| 356 | FILE is a file wildcard, relative to the root directory of DIRECTORY." | 356 | FILE is a wildcard specification, either relative to |
| 357 | (let* ((ignores (vc-svn-ignore-completion-table directory)) | 357 | DIRECTORY or absolute." |
| 358 | (file (file-relative-name file directory)) | 358 | (let* ((path (directory-file-name (expand-file-name file directory))) |
| 359 | (directory (file-name-directory path)) | ||
| 360 | (file (file-name-nondirectory path)) | ||
| 361 | (ignores (vc-svn-ignore-completion-table directory)) | ||
| 359 | (ignores (if remove | 362 | (ignores (if remove |
| 360 | (delete file ignores) | 363 | (delete file ignores) |
| 361 | (push file ignores)))) | 364 | (push file ignores)))) |
| 362 | (vc-svn-command nil 0 nil nil "propset" "svn:ignore" | 365 | (vc-svn-command nil 0 nil nil "propset" "svn:ignore" |
| 363 | (mapconcat #'identity ignores "\n") | 366 | (mapconcat #'identity ignores "\n") |
| 364 | (expand-file-name directory)))) | 367 | directory))) |
| 365 | 368 | ||
| 366 | (defun vc-svn-ignore-completion-table (directory) | 369 | (defun vc-svn-ignore-completion-table (directory) |
| 367 | "Return the list of ignored files in DIRECTORY." | 370 | "Return the list of ignored files in DIRECTORY." |