diff --git a/eden/fs/inodes/EdenMount.cpp b/eden/fs/inodes/EdenMount.cpp index 7cdf9277cd..f8340b8d57 100644 --- a/eden/fs/inodes/EdenMount.cpp +++ b/eden/fs/inodes/EdenMount.cpp @@ -10,6 +10,7 @@ #include #include #include +#include #include #include @@ -21,6 +22,7 @@ #include "eden/fs/config/CheckoutConfig.h" #include "eden/fs/config/EdenConfig.h" +#include "eden/fs/inodes/CheckoutContext.h" #include "eden/fs/inodes/FileInode.h" #include "eden/fs/inodes/InodeError.h" #include "eden/fs/inodes/InodeMap.h" @@ -54,7 +56,6 @@ #include #include "eden/fs/fuse/FuseChannel.h" #include "eden/fs/fuse/privhelper/PrivHelper.h" -#include "eden/fs/inodes/CheckoutContext.h" #include "eden/fs/inodes/EdenDispatcher.h" #include "eden/fs/inodes/InodeTable.h" #include "eden/fs/utils/FutureSubprocess.h" @@ -808,6 +809,7 @@ folly::Future EdenMount::resolveSymlinkImpl( }); }); } +#endif folly::Future EdenMount::checkout( Hash snapshotHash, @@ -895,6 +897,7 @@ folly::Future EdenMount::checkout( ctx->start(this->acquireRenameLock()); checkoutTimes->didAcquireRenameLock = stopWatch.elapsed(); +#ifndef _WIN32 /** * If a significant number of tree inodes are loaded or referenced @@ -915,6 +918,8 @@ folly::Future EdenMount::checkout( */ this->getRootInode()->unloadChildrenUnreferencedByFuse(); +#endif // !1 + return this->getRootInode()->checkout(ctx.get(), fromTree, toTree); }) .thenValue([ctx, checkoutTimes, stopWatch, snapshotHash](auto&&) { @@ -998,6 +1003,7 @@ folly::Future EdenMount::checkout( }); } +#ifndef _WIN32 folly::Future EdenMount::chown(uid_t uid, gid_t gid) { // 1) Ensure that all future opens will by default provide this owner setOwner(uid, gid); diff --git a/eden/fs/service/EdenServiceHandler.cpp b/eden/fs/service/EdenServiceHandler.cpp index 367d8d7e90..43db610b64 100644 --- a/eden/fs/service/EdenServiceHandler.cpp +++ b/eden/fs/service/EdenServiceHandler.cpp @@ -374,7 +374,6 @@ void EdenServiceHandler::checkOutRevision( std::unique_ptr mountPoint, std::unique_ptr hash, CheckoutMode checkoutMode) { -#ifndef _WIN32 auto helper = INSTRUMENT_THRIFT_CALL( DBG1, *mountPoint, @@ -385,9 +384,6 @@ void EdenServiceHandler::checkOutRevision( auto edenMount = server_->getMount(*mountPoint); auto checkoutFuture = edenMount->checkout(hashObj, checkoutMode); results = std::move(std::move(checkoutFuture).get().conflicts); -#else - NOT_IMPLEMENTED(); -#endif // !_WIN32 } void EdenServiceHandler::resetParentCommits(