Skip to content

Commit

Permalink
[Fix #1022] Fix Fossil detection (#1028)
Browse files Browse the repository at this point in the history
The fossil checkout database is named `.fslckout` or `_FOSSIL_`, not
`.fossil`. Searching for a dominating .fossil file would just find
`~/.fossil`, which is Fossil's user config database.
  • Loading branch information
michaelbartnett authored and bbatsov committed Jul 15, 2016
1 parent c9ca776 commit de72223
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
### Bugs fixed

* [#1024](https://github.com/bbatsov/projectile/issues/1024): Do not cache ignored project files.
* [#1022](https://github.com/bbatsov/projectile/issues/1022): Scan for Fossil's checkout DB, not its config DB

## 0.14.0 (2016-07-08)

Expand Down
6 changes: 4 additions & 2 deletions projectile.el
Original file line number Diff line number Diff line change
Expand Up @@ -1941,13 +1941,15 @@ PROJECT-ROOT is the targeted directory. If nil, use
(cond
((projectile-file-exists-p (expand-file-name ".git" project-root)) 'git)
((projectile-file-exists-p (expand-file-name ".hg" project-root)) 'hg)
((projectile-file-exists-p (expand-file-name ".fossil" project-root)) 'fossil)
((projectile-file-exists-p (expand-file-name ".fslckout" project-root)) 'fossil)
((projectile-file-exists-p (expand-file-name "_FOSSIL_" project-root)) 'fossil)
((projectile-file-exists-p (expand-file-name ".bzr" project-root)) 'bzr)
((projectile-file-exists-p (expand-file-name "_darcs" project-root)) 'darcs)
((projectile-file-exists-p (expand-file-name ".svn" project-root)) 'svn)
((projectile-locate-dominating-file project-root ".git") 'git)
((projectile-locate-dominating-file project-root ".hg") 'hg)
((projectile-locate-dominating-file project-root ".fossil") 'fossil)
((projectile-locate-dominating-file project-root ".fslckout") 'fossil)
((projectile-locate-dominating-file project-root "_FOSSIL_") 'fossil)
((projectile-locate-dominating-file project-root ".bzr") 'bzr)
((projectile-locate-dominating-file project-root "_darcs") 'darcs)
((projectile-locate-dominating-file project-root ".svn") 'svn)
Expand Down

0 comments on commit de72223

Please sign in to comment.