Skip to content

Conversation

@idodeclare
Copy link
Contributor

Hello,

Please consider for integration this patch to extract a small bit of logic from IndexDatabase so that history generation will respect ignored files/dirs as well as explicitly included files.

The symlink logic from IndexDatabase does not have to be lifted out, since history generation already handles ForbiddenSymlinkException. Including the symlink itself as a listed file in history is not an issue.

Also, this patch relocates Filter, IgnoredDirs, IgnoredFiles, and IgnoredNames to configuration.

Thank you.

@coveralls
Copy link

coveralls commented May 5, 2020

Pull Request Test Coverage Report for Build 5244

  • 47 of 51 (92.16%) changed or added relevant lines in 7 files are covered.
  • 2 unchanged lines in 2 files lost coverage.
  • Overall coverage increased (+0.007%) to 74.03%

Changes Missing Coverage Covered Lines Changed/Added Lines %
opengrok-indexer/src/main/java/org/opengrok/indexer/history/FileHistoryCache.java 22 23 95.65%
opengrok-indexer/src/main/java/org/opengrok/indexer/configuration/PathAccepter.java 10 13 76.92%
Files with Coverage Reduction New Missed Lines %
opengrok-indexer/src/main/java/org/opengrok/indexer/history/FileHistoryCache.java 1 75.6%
opengrok-web/src/main/java/org/opengrok/web/DirectoryListing.java 1 81.06%
Totals Coverage Status
Change from base Build 5243: 0.007%
Covered Lines: 40456
Relevant Lines: 54648

💛 - Coveralls

@tarzanek
Copy link
Contributor

tarzanek commented May 6, 2020

sorry, did it again, merged your other patch and created conflicts
tia for rebase

@idodeclare idodeclare force-pushed the feature/ignore_history branch from c654f46 to cc0f13c Compare May 6, 2020 15:53
@idodeclare
Copy link
Contributor Author

sorry, did it again, merged your other patch and created conflicts
tia for rebase

No worries, Lubos. Now rebased (just conflicts in copyright — your favorite). Thank you for taking a look.

@idodeclare
Copy link
Contributor Author

Oh no I tried the Github conflict resolver, but I don't like that it merged master into this branch. I'm revising....

@idodeclare idodeclare force-pushed the feature/ignore_history branch from d6f729b to fda1696 Compare May 28, 2020 14:39
@idodeclare
Copy link
Contributor Author

It was just a tiny conflict in RuntimeEnvironment.

@idodeclare
Copy link
Contributor Author

Rebased for minor conflicts after #3154

- Extract path-based including/ignoring to configuration
- Also, relocate Filter, IgnoredDirs, IgnoredFiles,
  IgnoredNames to configuration
@idodeclare
Copy link
Contributor Author

Just resolving a conflict in copyright...

@idodeclare idodeclare force-pushed the feature/ignore_history branch from bee2185 to ced8d70 Compare August 19, 2020 01:03
@vladak vladak merged commit 40669ec into oracle:master Aug 20, 2020
@vladak
Copy link
Member

vladak commented Aug 20, 2020

Looks quite clean, thanks !

@idodeclare
Copy link
Contributor Author

Thank you, @vladak!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants