Remove empty directories after discarding untracked files

[stefanhaller]

When discarding untracked files, remove any directories that have become empty because of this.

Fixes #1964.

[DusanLesan]

It works. The only pause this gave me was when deleting the go telemetry directory after a go run command. But Go created an empty directory named upload that apparently blocked removal of the whole tree, and only local ended up being removed. I am fine with that

[stefanhaller]

@DusanLesan Yeah, I was actually unsure if removing those empty directories unconditionally is always what you want. Like, you might create a new directory src/lib/my-new-module and create a first source file in there; then, after hacking for a bit you realize you want to start over with a differently named source file, and discard the file. You'd then have to recreate the directories to create that new file, which could be annoying.

Maybe we should make it dependent on what you selected when you hit discard: selecting the my-new-module folder would delete it when it becomes empty, but selecting the file inside would not. I'll look into changing that.

I didn't understand your example enough to tell whether it would be affected by this.

[DusanLesan]

I didn't understand your example enough to tell whether it would be affected by this

DP-0_recording.mp4

Here is exact case I've tried to explain. I would expect for whole go dir to be removed but it is left there because of the empty directory created by go.

[codacy-production]

Coverage summary from Codacy

See diff coverage on Codacy

Coverage variation	Diff coverage
Report missing for dd7a3fa1	✅ 85.71%

Coverage variation details

	Coverable lines	Covered lines	Coverage
Common ancestor commit (dd7a3fa)	Report Missing	Report Missing	Report Missing
Head commit (2a6648f)	61023	53452	87.59%

Coverage variation is the difference between the coverage for the head and common ancestor commits of the pull request branch: <coverage of head commit> - <coverage of common ancestor commit>

Diff coverage details

	Coverable lines	Covered lines	Diff coverage
Pull request (#5408)	77	66	85.71%

Diff coverage is the percentage of lines that are covered by tests out of the coverable lines that the pull request added or modified: <covered lines added or modified>/<coverable lines added or modified> * 100%

See your quality gate settings    Change summary preferences

Footnotes

1. Codacy didn't receive coverage data for the commit, or there was an error processing the received data. Check your integration for errors and validate that your coverage setup is correct. ↩

[stefanhaller]

Ok, this gets tricky now. I made the change I mentioned above, where directories are only removed if you select them explicitly for discarding (or one of their parent directories). If you select the last untracked file in a directory and discard it, the directory is not removed; so far so desirable, I'd say.

The problem is that if you do want to get rid of the go directory or the telemetry directory in your example (assuming this upload folder didn't exist), there'd be no way to do that, because you can't select those (because of the directory collapsing that lazygit does). The only directory that you can select is local, so only that gets removed.

Not sure how much of a problem this is, or what to do about it. Input welcome.

[DusanLesan]

Not sure how much of a problem this is, or what to do about it. Input welcome

It is just a slight inconvenience to me and I guess it is safer not to remove even if it were easy to implement as some users might expect only the files on the displayed path to be removed. upload was not even shown in the TUI so some could say it should stay unaffected by discarding

[stefanhaller]

Yes, but I'm not talking about your upload folder here, I think the behavior wrt that is fine. There's no reason for the discard feature to delete it, since it's a sibling of the thing that you are discarding.

I'm talking about the case where you have

▼ a/b/c
  ?? x.txt

and want to select a to discard it; you can't, you can only select c. So it will keep a and b, and only delete c.