Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Fix #1022] Fix Fossil detection #1028

Merged
merged 1 commit into from
Jul 15, 2016

Conversation

michaelbartnett
Copy link
Contributor

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.

I made the changes projectile-project-vcs such that when it searches for a Fossil repo checkout in the current directory or looks for the dominating project file, it tries .fslckout, then _FOSSIL_ for the reasons described above.

@npostavs identified the needed changes in #1022's comment thread.

There were no existing tests for projectile-project-vcs, and figured having Fossil as a test dependency would be no good, so I did not add or change any tests for this.

I did a manual:

  1. Created a Fossil repo and checked it out, and ran touch .projectile.

    testfossil1/
      test.fossil
      .fslckout
      .projectile
    
  2. Ran fossil add .projectile; fossil commit -m "add projetcile file"; touch test.txt

    testfossil1/
      test.fossil
      .fslckout
      .projectile
      test.txt <- new file
    
  3. Verified that projectile-find-file listed .projectile but not test.txt.


Before submitting a PR make sure the following things have been done (and denote this
by checking the relevant checkboxes):

  • The commits are consistent with our contribution guidelines
  • You've added tests (if possible) to cover your change(s)
  • All tests are passing (make test)
  • The new code is not generating bytecode or M-x checkdoc warnings
  • You've updated the changelog (if adding/changing user-visible functionality)
  • You've updated the readme (if adding/changing user-visible functionality)

Thanks!

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.
@bbatsov bbatsov merged commit de72223 into bbatsov:master Jul 15, 2016
@bbatsov
Copy link
Owner

bbatsov commented Jul 15, 2016

👍 Thanks!

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.

2 participants