facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-12-29 08:02:24 +03:00
Code Issues Projects Releases Wiki Activity

flip EDEN_WIN_NO_RUST_DATAPACK to EDEN_HAVE_RUST_DATAPACK

Browse Source 
Summary: Using a positive meaning rather than a double negative makes the build a tad simpler.

Reviewed By: strager

Differential Revision: D17000620

fbshipit-source-id: ff27eb8098786b8ed6ed1ba81166b51e29e62d47
This commit is contained in:
Chad Austin 2019-08-27 17:02:49 -07:00 committed by Facebook Github Bot
parent 7f19614fc2
commit fcb10e77de
5 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMake/EdenConfigChecks.cmake
View File

@ -74,7 +74,7 @@ set(EDEN_HAVE_CURL ${CURL_FOUND})
if (WIN32)
find_package(Prjfs MODULE REQUIRED)
endif()
set(EDEN_WIN_NO_RUST_DATAPACK ON)
set(EDEN_HAVE_RUST_DATAPACK OFF)
set(EDEN_WIN_NOMONONOKE ON)
# TODO(strager): Support systemd in the opensource build.

3
CMake/eden-config.h.in
View File

@ -15,5 +15,4 @@
#cmakedefine EDEN_HAVE_SYSTEMD
#cmakedefine EDEN_HAVE_CURL
#cmakedefine EDEN_WIN_NOMONONOKE
#cmakedefine EDEN_WIN_NO_RUST_DATAPACK
#cmakedefine EDEN_HAVE_RUST_DATAPACK

10
eden/fs/store/hg/HgBackingStore.cpp
View File

@ -36,7 +36,7 @@
#include "edenscm/hgext/extlib/cstore/uniondatapackstore.h" // @manual=//scm/hg:datapack
#include "edenscm/hgext/extlib/ctreemanifest/treemanifest.h" // @manual=//scm/hg:datapack
#ifndef EDEN_WIN_NO_RUST_DATAPACK
#if EDEN_HAVE_RUST_DATAPACK
#include "scm/hg/lib/configparser/ConfigParser.h"
#endif
@ -191,7 +191,7 @@ std::unique_ptr<Blob> getBlobFromUnionStore(
return nullptr;
}
#ifndef EDEN_WIN_NO_RUST_DATAPACK
#if EDEN_HAVE_RUST_DATAPACK
std::unique_ptr<Blob> getBlobFromDataPackUnion(
DataPackUnion& store,
const Hash& id,
@ -248,7 +248,7 @@ HgBackingStore::HgBackingStore(
stats))),
config_(config),
serverThreadPool_(serverThreadPool) {
#ifndef EDEN_WIN_NO_RUST_DATAPACK
#if EDEN_HAVE_RUST_DATAPACK
initializeDatapackImport(repository);
#endif
HgImporter importer(
@ -274,7 +274,7 @@ HgBackingStore::HgBackingStore(
HgBackingStore::~HgBackingStore() {}
#ifndef EDEN_WIN_NO_RUST_DATAPACK
#if EDEN_HAVE_RUST_DATAPACK
namespace {
folly::Synchronized<DataPackUnion> makeUnionStore(
AbsolutePathPiece repository,
@ -753,7 +753,7 @@ Future<unique_ptr<Blob>> HgBackingStore::getBlob(const Hash& id) {
// which we need to import the data from mercurial
HgProxyHash hgInfo(localStore_, id, "importFileContents");
#ifndef EDEN_WIN_NO_RUST_DATAPACK
#if EDEN_HAVE_RUST_DATAPACK
if (useDatapackGetBlob_ && dataPackStore_) {
auto content =
getBlobFromDataPackUnion(*dataPackStore_.value().wlock(), id, hgInfo);

4
eden/fs/store/hg/HgBackingStore.h
View File

@ -11,7 +11,7 @@
#include "eden/fs/store/BackingStore.h"
#include "eden/fs/store/LocalStore.h"
#include "eden/fs/utils/PathFuncs.h"
#ifndef EDEN_WIN_NO_RUST_DATAPACK
#if EDEN_HAVE_RUST_DATAPACK
#include "scm/hg/lib/revisionstore/RevisionStore.h"
#endif
#include "eden/fs/tracing/EdenStats.h"
@ -205,7 +205,7 @@ class HgBackingStore : public BackingStore {
std::string repoName_;
folly::Synchronized<std::shared_ptr<BackingStore>> mononoke_;
#ifndef EDEN_WIN_NO_RUST_DATAPACK
#if EDEN_HAVE_RUST_DATAPACK
std::optional<folly::Synchronized<DataPackUnion>> dataPackStore_;
#endif
};

4
eden/win/fs/edenfs.vcxproj
View File

@ -104,7 +104,7 @@
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>_DEBUG;_WINDOWS;_SCL_SECURE_NO_WARNINGS;EDEN_WIN_NOMONONOKE;EDEN_WIN_NO_RUST_DATAPACK;GLOG_NO_ABBREVIATED_SEVERITIES;_SILENCE_CXX17_OLD_ALLOCATOR_MEMBERS_DEPRECATION_WARNING;_SILENCE_ALL_CXX17_DEPRECATION_WARNINGS;_ENABLE_EXTENDED_ALIGNED_STORAGE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>_DEBUG;_WINDOWS;_SCL_SECURE_NO_WARNINGS;EDEN_WIN_NOMONONOKE;GLOG_NO_ABBREVIATED_SEVERITIES;_SILENCE_CXX17_OLD_ALLOCATOR_MEMBERS_DEPRECATION_WARNING;_SILENCE_ALL_CXX17_DEPRECATION_WARNINGS;_ENABLE_EXTENDED_ALIGNED_STORAGE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>false</ConformanceMode>
<LanguageStandard>stdcpp17</LanguageStandard>
<AdditionalIncludeDirectories>D:\edenwin64\stubs;$(SolutionDir)\build\thrift;D:\edenwin64\pklib\include;D:\edenwin64\vcpkg\installed\x64-windows\include;$(SolutionDir)\..\..\;$(SolutionDir)\..\..\scm\hg;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@ -141,7 +141,7 @@
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<SDLCheck>false</SDLCheck>
<PreprocessorDefinitions>NDEBUG;_WINDOWS;_SCL_SECURE_NO_WARNINGS;EDEN_WIN_NOMONONOKE;EDEN_WIN_NO_RUST_DATAPACK;_SILENCE_CXX17_OLD_ALLOCATOR_MEMBERS_DEPRECATION_WARNING;_SILENCE_ALL_CXX17_DEPRECATION_WARNINGS;_ENABLE_EXTENDED_ALIGNED_STORAGE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>NDEBUG;_WINDOWS;_SCL_SECURE_NO_WARNINGS;EDEN_WIN_NOMONONOKE;_SILENCE_CXX17_OLD_ALLOCATOR_MEMBERS_DEPRECATION_WARNING;_SILENCE_ALL_CXX17_DEPRECATION_WARNINGS;_ENABLE_EXTENDED_ALIGNED_STORAGE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>false</ConformanceMode>
<LanguageStandard>stdcpp17</LanguageStandard>
<AdditionalIncludeDirectories>D:\edenwin64\stubs;$(SolutionDir)\build\thrift;D:\edenwin64\pklib\include;D:\edenwin64\vcpkg\installed\x64-windows\include;$(SolutionDir)\..\..\;$(SolutionDir)\..\..\scm\hg;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>