Re: [PATCH 1/4] git.el: Support for showing unknown/ignored directories.

Karl Hasselström [off-list ref] writes:

On 2008-02-07 13:50:19 +0100, Alexandre Julliard wrote:

quoted

Instead of recursing into directories that only contain unknown
files, display only the directory itself. Its contents can be
expanded with git-find-file (bound to C-m).

I have a bunch of directories in my tree with only ignored files in
them. They used to not show up at all, but now they do. If I press
return with the cursor on top of one of them, it vanishes (which is
equivalent to expanding to all the 0 non-ignored files in that
directory, I guess).

I presume this wasn't the intended behavior? I like the idea for
subdirectories that actually contain non-ignored files, but
directories with only ignored files should really not be shown at all.

It probably needs something like this:

From b32a397a64eec64d433aa0ee00147003723cfeee Mon Sep 17 00:00:00 2001
From: Alexandre Julliard <redacted>
Date: Fri, 22 Feb 2008 16:48:53 +0100
Subject: [PATCH] git.el: Do not display empty directories.

Signed-off-by: Alexandre Julliard <redacted>
---
 contrib/emacs/git.el |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/contrib/emacs/git.el b/contrib/emacs/git.el
index d91fbb8..7cb86df 100644
--- a/contrib/emacs/git.el
+++ b/contrib/emacs/git.el

@@ -753,7 +753,7 @@ Return the list of files that haven't been handled."
 (defun git-run-ls-files-with-excludes (status files default-state &rest options)
   "Run git-ls-files on FILES with appropriate --exclude-from options."
   (let ((exclude-files (git-get-exclude-files)))
-    (apply #'git-run-ls-files status files default-state "--directory"
+    (apply #'git-run-ls-files status files default-state "--directory" "--no-empty-directory"
            (concat "--exclude-per-directory=" git-per-dir-ignore-file)
            (append options (mapcar (lambda (f) (concat "--exclude-from=" f)) exclude-files)))))
 

-- 
1.5.4.1.132.gd85f75

-- 
Alexandre Julliard
julliard@winehq.org

On 2008-02-22 16:53:16 +0100, Alexandre Julliard wrote:

Karl Hasselström [off-list ref] writes:

quoted

I have a bunch of directories in my tree with only ignored files
in them. They used to not show up at all, but now they do.

It probably needs something like this:

That fixed the problem. Thanks!

Signed-off-by: Alexandre Julliard <redacted>

Tested-by: Karl Hasselström <redacted>

-- 
Karl Hasselström, kha@treskal.com
      www.treskal.com/kalle

On 2008-02-22 18:10:52 +0100, Karl Hasselström wrote:

On 2008-02-22 16:53:16 +0100, Alexandre Julliard wrote:

quoted

Karl Hasselström [off-list ref] writes:

quoted

I have a bunch of directories in my tree with only ignored files
in them. They used to not show up at all, but now they do.

It probably needs something like this:

That fixed the problem. Thanks!

quoted

Signed-off-by: Alexandre Julliard <redacted>

Tested-by: Karl Hasselström <redacted>

Junio, did you see this bugfix? (I just realized you weren't cc'ed, so
I guess not.)

-- 
Karl Hasselström, kha@treskal.com
      www.treskal.com/kalle

Karl Hasselström [off-list ref] writes:

On 2008-02-22 18:10:52 +0100, Karl Hasselström wrote:
...

quoted

That fixed the problem. Thanks!

quoted

Signed-off-by: Alexandre Julliard <redacted>

Tested-by: Karl Hasselström <redacted>

Junio, did you see this bugfix? (I just realized you weren't cc'ed, so
I guess not.)

No, and thanks.

So I'll take

    From: Alexandre Julliard [off-list ref]
    Message-ID: [off-list ref]
    
aka

    http://article.gmane.org/gmane.comp.version-control.git/74730

in this thread with your Tested-by: and apply to fix 3f3d564
(git.el: Support for showing unknown/ignored directories.)?

On 2008-02-27 11:48:30 -0800, Junio C Hamano wrote:

Karl Hasselström [off-list ref] writes:

quoted

Junio, did you see this bugfix? (I just realized you weren't
cc'ed, so I guess not.)

No, and thanks.

So I'll take

    From: Alexandre Julliard [off-list ref]
    Message-ID: [off-list ref]

aka

    http://article.gmane.org/gmane.comp.version-control.git/74730

in this thread with your Tested-by: and apply to fix 3f3d564
(git.el: Support for showing unknown/ignored directories.)?

Yes, exactly. Thanks.

(Would you like this kind of detailed pointer in a reminder, or is the
threading support in your mailer good enough that just replying to the
right mail will do it?)

-- 
Karl Hasselström, kha@treskal.com
      www.treskal.com/kalle