# [RFH PATCH] Teach the emacs git mode about core.excludesfile 4 messages from 2007-07-31 to 2007-07-31. Participants: Karl Hasselström, Matthieu Moy, Alexandre Julliard. Thread: https://gitlist.dev/t/9320 ## Karl Hasselström, 2007-07-31 01:13 Subject: [RFH PATCH] Teach the emacs git mode about core.excludesfile Message-ID: <20070731011100.23561.27554.stgit@yoghurt> URL: https://gitlist.dev/e/20070731011100.23561.27554.stgit%40yoghurt ``` If there is a core.excludesfile option specified, let the emacs git mode take exclude patterns from that file, since that's what the docs say, and what everyone else is already doing. Signed-off-by: Karl Hasselström --- This is a Request For Help. The patch works, but is clearly the work of someone who is not very fluent in elisp. Just look at all that duplicated code I've introduced! contrib/emacs/git.el | 19 ++++++++++++++++--- 1 files changed, 16 insertions(+), 3 deletions(-) diff --git a/contrib/emacs/git.el b/contrib/emacs/git.el index 53dd703..357e6d2 100644 --- a/contrib/emacs/git.el +++ b/contrib/emacs/git.el @@ -589,6 +589,13 @@ Return the list of files that haven't been handled." (when node (push (ewoc-data node) unmerged-files)))) (git-set-files-state unmerged-files 'unmerged)))) +(defun git-core-excludesfile () + "The file core.excludesfile, or nil if it isn't specified." + (let ((fn (git-config "core.excludesfile"))) + (if (and fn (file-readable-p fn)) + fn + nil))) + (defun git-update-status-files (files &optional default-state) "Update the status of FILES from the index." (unless git-status (error "Not in git-status buffer.")) @@ -600,9 +607,15 @@ Return the list of files that haven't been handled." (git-run-ls-unmerged status files) (when (and (or (not files) remaining-files) (file-readable-p ".git/info/exclude")) - (setq remaining-files (git-run-ls-files status remaining-files - 'unknown "-o" "--exclude-from=.git/info/exclude" - (concat "--exclude-per-directory=" git-per-dir-ignore-file)))) + (let ((ce (git-core-excludesfile))) + (if ce + (setq remaining-files (git-run-ls-files status remaining-files + 'unknown "-o" "--exclude-from=.git/info/exclude" + (concat "--exclude-per-directory=" git-per-dir-ignore-file) + (concat "--exclude-from=" ce))) + (setq remaining-files (git-run-ls-files status remaining-files + 'unknown "-o" "--exclude-from=.git/info/exclude" + (concat "--exclude-per-directory=" git-per-dir-ignore-file)))))) ; mark remaining files with the default state (or remove them if nil) (when remaining-files (if default-state ``` ## Matthieu Moy, 2007-07-31 01:58 Subject: Re: [RFH PATCH] Teach the emacs git mode about core.excludesfile Message-ID: URL: https://gitlist.dev/e/vpqzm1dqqps.fsf%40bauges.imag.fr In-Reply-To: <20070731011100.23561.27554.stgit@yoghurt> ``` Karl Hasselström writes: > If there is a core.excludesfile option specified, let the emacs git > mode take exclude patterns from that file, since that's what the docs > say, and what everyone else is already doing. > > Signed-off-by: Karl Hasselström > --- > > This is a Request For Help. The patch works, but is clearly the work > of someone who is not very fluent in elisp. Just look at all that > duplicated code I've introduced! > > contrib/emacs/git.el | 19 ++++++++++++++++--- > 1 files changed, 16 insertions(+), 3 deletions(-) > > diff --git a/contrib/emacs/git.el b/contrib/emacs/git.el > index 53dd703..357e6d2 100644 > --- a/contrib/emacs/git.el > +++ b/contrib/emacs/git.el > @@ -589,6 +589,13 @@ Return the list of files that haven't been handled." > (when node (push (ewoc-data node) unmerged-files)))) > (git-set-files-state unmerged-files 'unmerged)))) > > +(defun git-core-excludesfile () > + "The file core.excludesfile, or nil if it isn't specified." > + (let ((fn (git-config "core.excludesfile"))) > + (if (and fn (file-readable-p fn)) > + fn > + nil))) > + > (defun git-update-status-files (files &optional default-state) > "Update the status of FILES from the index." > (unless git-status (error "Not in git-status buffer.")) > @@ -600,9 +607,15 @@ Return the list of files that haven't been handled." > (git-run-ls-unmerged status files) > (when (and (or (not files) remaining-files) > (file-readable-p ".git/info/exclude")) > - (setq remaining-files (git-run-ls-files status remaining-files > - 'unknown "-o" "--exclude-from=.git/info/exclude" > - (concat "--exclude-per-directory=" git-per-dir-ignore-file)))) What you're looking for probably looks like that: (let ((ce (git-core-excludesfile))) (setq remaining-files (apply 'git-run-ls-files `(,status ,remaining-files unknown "-o" ... ,@(when ce (list ce)))))) (the magic is in the backquote and the ,@ in `(... ,@(...))) (totally untested, probably bogus) -- Matthieu ``` ## Alexandre Julliard, 2007-07-31 10:36 Subject: Re: [RFH PATCH] Teach the emacs git mode about core.excludesfile Message-ID: <87abtcvozz.fsf@wine.dyndns.org> URL: https://gitlist.dev/e/87abtcvozz.fsf%40wine.dyndns.org In-Reply-To: <20070731011100.23561.27554.stgit@yoghurt> ``` Karl Hasselström writes: > This is a Request For Help. The patch works, but is clearly the work > of someone who is not very fluent in elisp. Just look at all that > duplicated code I've introduced! I would do it this way: From: Alexandre Julliard Date: Tue, 31 Jul 2007 12:19:05 +0200 Subject: [PATCH] git.el: Take into account the core.excludesfile config option. Also don't require .git/info/exclude to exist in order to list unknown files. Signed-off-by: Alexandre Julliard --- contrib/emacs/git.el | 20 +++++++++++++++----- 1 files changed, 15 insertions(+), 5 deletions(-) diff --git a/contrib/emacs/git.el b/contrib/emacs/git.el index 53dd703..9bcd7c4 100644 --- a/contrib/emacs/git.el +++ b/contrib/emacs/git.el @@ -589,6 +589,16 @@ Return the list of files that haven't been handled." (when node (push (ewoc-data node) unmerged-files)))) (git-set-files-state unmerged-files 'unmerged)))) +(defun git-get-exclude-files () + "Get the list of exclude files to pass to git-ls-files." + (let (files + (config (git-config "core.excludesfile"))) + (when (file-readable-p ".git/info/exclude") + (push ".git/info/exclude" files)) + (when (and config (file-readable-p config)) + (push config files)) + files)) + (defun git-update-status-files (files &optional default-state) "Update the status of FILES from the index." (unless git-status (error "Not in git-status buffer.")) @@ -598,11 +608,11 @@ Return the list of files that haven't been handled." (git-run-ls-files status files 'added "-c") (git-run-diff-index status files)))) (git-run-ls-unmerged status files) - (when (and (or (not files) remaining-files) - (file-readable-p ".git/info/exclude")) - (setq remaining-files (git-run-ls-files status remaining-files - 'unknown "-o" "--exclude-from=.git/info/exclude" - (concat "--exclude-per-directory=" git-per-dir-ignore-file)))) + (when (or (not files) remaining-files) + (let ((exclude-files (git-get-exclude-files))) + (setq remaining-files (apply #'git-run-ls-files status remaining-files 'unknown "-o" + (concat "--exclude-per-directory=" git-per-dir-ignore-file) + (mapcar (lambda (f) (concat "--exclude-from=" f)) exclude-files))))) ; mark remaining files with the default state (or remove them if nil) (when remaining-files (if default-state -- 1.5.3.rc3.92.g70c7b -- Alexandre Julliard julliard@winehq.org ``` ## Karl Hasselström, 2007-07-31 19:57 Subject: Re: [RFH PATCH] Teach the emacs git mode about core.excludesfile Message-ID: <20070731195700.GC28331@diana.vm.bytemark.co.uk> URL: https://gitlist.dev/e/20070731195700.GC28331%40diana.vm.bytemark.co.uk In-Reply-To: <87abtcvozz.fsf@wine.dyndns.org> ``` On 2007-07-31 12:36:32 +0200, Alexandre Julliard wrote: > I would do it this way: > > From: Alexandre Julliard > Date: Tue, 31 Jul 2007 12:19:05 +0200 > Subject: [PATCH] git.el: Take into account the core.excludesfile config option. > > Also don't require .git/info/exclude to exist in order to list unknown > files. > > Signed-off-by: Alexandre Julliard Acked-by: Karl Hasselström Works beautifully, thanks. -- Karl Hasselström, kha@treskal.com www.treskal.com/kalle ```