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

[Mount Removal] Remove GitObjectsRoot and LocalCacheRoot from RepoMetadata.dat and switch to 'gvfs.sharedCache' #137

Merged
merged 3 commits into from
Oct 1, 2019

Conversation

wilbaker
Copy link
Member

@wilbaker wilbaker commented Oct 1, 2019

Resolves #133

  • Manually pulled over changes from Use GVFS Helper transport instead of read object hook #122 for setting the git objects root in the local git config file
  • Removed the code for saving/loading local cache root and git objects root from RepoMetadata
  • Updated MountFailsWhenNoGitObjectsRootInRepoMetadata to adjust the git config rather than the RepoMetadata.dat file, although I did not test it as those tests are not currently running and the mount verb will eventually be removed.
  • Updated the functional tests to read the git objects root from gvfs.sharedCache rather than from the RepoMetadata file.

Changes to additional LocalCacheRoot related code will come in a separate PR

Copied changes from derrickstolee:gvfs-helper
that updated Scalar verbs to set the object cache in
git's config file.
@wilbaker wilbaker requested a review from derrickstolee October 1, 2019 19:07
Copy link
Contributor

@derrickstolee derrickstolee left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you are doing the cache-server setting in a follow-up, then ignore my one comment. Thanks!

Scalar.Common/ScalarConstants.cs Outdated Show resolved Hide resolved
Scalar/CommandLine/ScalarVerb.cs Show resolved Hide resolved
@wilbaker wilbaker force-pushed the use_git_config_for_cache branch from dffd208 to 9dc0a9b Compare October 1, 2019 19:54
@wilbaker
Copy link
Member Author

wilbaker commented Oct 1, 2019

@derrickstolee FYI - I saw from the functional test failures there were a few spots I still need to update in the functional tests. I will push another set of commits once I've fixed that code up.

@wilbaker wilbaker force-pushed the use_git_config_for_cache branch 3 times, most recently from 8ae5e81 to 40da08d Compare October 1, 2019 21:59
Update Scalar to depend on the local git config for the git
objects root and the local cache root and remove them from
RepoMetadata.dat
@wilbaker wilbaker force-pushed the use_git_config_for_cache branch from 40da08d to aa7eaa2 Compare October 1, 2019 22:38
@wilbaker wilbaker merged commit c7ca636 into microsoft:master Oct 1, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
2 participants