facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-07 23:38:50 +03:00
Code Issues Projects Releases Wiki Activity

gate treemanifest code with EDEN_HAVE_HG_TREEMANIFEST

Browse Source 
Summary:
Make sure all code that requires treemanifest is properly gated with
`EDEN_HAVE_HG_TREEMANIFEST` checks.

Reviewed By: chadaustin

Differential Revision: D10436528

fbshipit-source-id: b57005980242a3152f08b654306bff6e9c3ea4d3
This commit is contained in:
Adam Simpkins 2018-10-18 04:13:10 -07:00 committed by Facebook Github Bot
parent 0eb3addd6d
commit 9fd20febad
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -133,6 +133,7 @@ class HgImporterTestExecutor : public folly::InlineExecutor {
}
};
#if EDEN_HAVE_HG_TREEMANIFEST
// A helper function to avoid repeating noisy casts/conversions when
// loading data from a UnionDatapackStore instance.
template <typename UnionStore>
@ -144,6 +145,7 @@ unionStoreGet(UnionStore&& unionStore, StringPiece name, const Hash& id) {
(const char*)id.getBytes().data(),
id.getBytes().size()));
}
#endif // EDEN_HAVE_HG_TREEMANIFEST
} // namespace
@ -282,10 +284,11 @@ Future<unique_ptr<Tree>> HgBackingStore::getTree(const Hash& id) {
return tree;
});
#else
return Future<T>(make_exception_wrapper<std::domain_error>(folly::to<string>(
return Future<unique_ptr<Tree>>(folly::make_exception_wrapper<
std::domain_error>(folly::to<std::string>(
"requested to import subtree ",
id.toString(),
" but flatmanifest import should have already imported all subtrees"));
" but flatmanifest import should have already imported all subtrees")));
#endif
}
@ -553,6 +556,7 @@ Future<unique_ptr<Blob>> HgBackingStore::getBlob(const Hash& id) {
// which we need to import the data from mercurial
HgProxyHash hgInfo(localStore_, id, "importFileContents");
#if EDEN_HAVE_HG_TREEMANIFEST
#ifndef EDEN_WIN_NOMONONOKE
if (mononoke_) {
XLOG(DBG5) << "requesting file contents of '" << hgInfo.path() << "', "
@ -576,6 +580,7 @@ Future<unique_ptr<Blob>> HgBackingStore::getBlob(const Hash& id) {
});
}
#endif // EDEN_WIN_NOMONONOKE
#endif // EDEN_HAVE_HG_TREEMANIFEST
return folly::via(
importThreadPool_.get(),

2
eden/fs/store/hg/HgImporter.cpp
View File

@ -43,8 +43,10 @@
#include "eden/fs/utils/PathFuncs.h"
#include "eden/fs/utils/TimeUtil.h"
#if EDEN_HAVE_HG_TREEMANIFEST
// Needed for MissingKeyError
#include "hgext/extlib/cstore/uniondatapackstore.h" // @manual=//scm/hg:datapack
#endif // EDEN_HAVE_HG_TREEMANIFEST
using folly::ByteRange;
using folly::Endian;