diff --git a/eden/mononoke/tests/integration/test-getpackv1.t b/eden/mononoke/tests/integration/test-getpackv1.t index fe433eba58..3e6de04126 100644 --- a/eden/mononoke/tests/integration/test-getpackv1.t +++ b/eden/mononoke/tests/integration/test-getpackv1.t @@ -5,6 +5,7 @@ # directory of this source tree. $ . "${TEST_FIXTURES}/library.sh" + $ setconfig remotefilelog.write-hgcache-to-indexedlog=False remotefilelog.write-local-to-indexedlog=False setup configuration $ setup_common_config diff --git a/eden/mononoke/tests/integration/test-getpackv2.t b/eden/mononoke/tests/integration/test-getpackv2.t index 88f94d2795..6adf92922a 100644 --- a/eden/mononoke/tests/integration/test-getpackv2.t +++ b/eden/mononoke/tests/integration/test-getpackv2.t @@ -5,6 +5,7 @@ # directory of this source tree. $ . "${TEST_FIXTURES}/library.sh" + $ setconfig remotefilelog.write-hgcache-to-indexedlog=False remotefilelog.write-local-to-indexedlog=False setup configuration $ setup_common_config diff --git a/eden/mononoke/tests/integration/test-gettreepack.t b/eden/mononoke/tests/integration/test-gettreepack.t index 53e9ac6547..e8292987b3 100644 --- a/eden/mononoke/tests/integration/test-gettreepack.t +++ b/eden/mononoke/tests/integration/test-gettreepack.t @@ -5,6 +5,7 @@ # directory of this source tree. $ . "${TEST_FIXTURES}/library.sh" + $ setconfig remotefilelog.write-hgcache-to-indexedlog=False remotefilelog.write-local-to-indexedlog=False setup configuration $ setup_common_config diff --git a/eden/mononoke/tests/integration/test-inconsistent-hash.t b/eden/mononoke/tests/integration/test-inconsistent-hash.t index 5959a7072a..89a48cf4c8 100644 --- a/eden/mononoke/tests/integration/test-inconsistent-hash.t +++ b/eden/mononoke/tests/integration/test-inconsistent-hash.t @@ -6,6 +6,7 @@ $ CACHEDIR=$PWD/cachepath $ . "${TEST_FIXTURES}/library.sh" + $ setconfig remotefilelog.write-hgcache-to-indexedlog=False remotefilelog.write-local-to-indexedlog=False # setup config repo diff --git a/eden/mononoke/tests/integration/test-lfs-to-mononoke.t b/eden/mononoke/tests/integration/test-lfs-to-mononoke.t index c9af44d6c6..217f377153 100644 --- a/eden/mononoke/tests/integration/test-lfs-to-mononoke.t +++ b/eden/mononoke/tests/integration/test-lfs-to-mononoke.t @@ -6,6 +6,7 @@ $ CACHEDIR=$PWD/cachepath $ . "${TEST_FIXTURES}/library.sh" + $ setconfig remotefilelog.write-hgcache-to-indexedlog=False remotefilelog.write-local-to-indexedlog=False Setup repo config (we use blob_files to share across Mononoke and API Server): $ LFS_THRESHOLD="1000" setup_common_config "blob_files" diff --git a/eden/mononoke/tests/integration/test-linknodes.t b/eden/mononoke/tests/integration/test-linknodes.t index 1c171598e5..6d11cbb561 100644 --- a/eden/mononoke/tests/integration/test-linknodes.t +++ b/eden/mononoke/tests/integration/test-linknodes.t @@ -5,6 +5,7 @@ # directory of this source tree. $ . "${TEST_FIXTURES}/library.sh" + $ setconfig remotefilelog.write-hgcache-to-indexedlog=False remotefilelog.write-local-to-indexedlog=False define an extension that reveals when Mercurial is fixing up linkrevs diff --git a/eden/scm/lib/revisionstore/src/contentstore.rs b/eden/scm/lib/revisionstore/src/contentstore.rs index 929b02bed5..75f99bc0cf 100644 --- a/eden/scm/lib/revisionstore/src/contentstore.rs +++ b/eden/scm/lib/revisionstore/src/contentstore.rs @@ -372,19 +372,20 @@ impl<'a> ContentStoreBuilder<'a> { let shared_lfs_store = Arc::new(LfsStore::shared(&cache_path, self.config)?); blob_stores.add(shared_lfs_store.clone()); - let primary: Arc = if self - .config - .get_or_default::("remotefilelog", "write-hgcache-to-indexedlog")? - { - // Put the indexedlog first, since recent data will have gone there. - datastore.add(shared_indexedlogdatastore.clone()); - datastore.add(shared_pack_store.clone()); - shared_indexedlogdatastore - } else { - datastore.add(shared_pack_store.clone()); - datastore.add(shared_indexedlogdatastore.clone()); - shared_pack_store - }; + let primary: Arc = + if self + .config + .get_or("remotefilelog", "write-hgcache-to-indexedlog", || true)? + { + // Put the indexedlog first, since recent data will have gone there. + datastore.add(shared_indexedlogdatastore.clone()); + datastore.add(shared_pack_store); + shared_indexedlogdatastore + } else { + datastore.add(shared_pack_store.clone()); + datastore.add(shared_indexedlogdatastore); + shared_pack_store + }; datastore.add(shared_lfs_store.clone()); let shared_mutabledatastore: Arc = { @@ -416,19 +417,20 @@ impl<'a> ContentStoreBuilder<'a> { IndexedLogDataStoreType::Local, )?); - let primary: Arc = if self - .config - .get_or_default::("remotefilelog", "write-local-to-indexedlog")? - { - // Put the indexedlog first, since recent data will have gone there. - datastore.add(local_indexedlogdatastore.clone()); - datastore.add(local_pack_store); - local_indexedlogdatastore - } else { - datastore.add(local_pack_store.clone()); - datastore.add(local_indexedlogdatastore); - local_pack_store - }; + let primary: Arc = + if self + .config + .get_or("remotefilelog", "write-local-to-indexedlog", || true)? + { + // Put the indexedlog first, since recent data will have gone there. + datastore.add(local_indexedlogdatastore.clone()); + datastore.add(local_pack_store); + local_indexedlogdatastore + } else { + datastore.add(local_pack_store.clone()); + datastore.add(local_indexedlogdatastore); + local_pack_store + }; let local_lfs_store = Arc::new(LfsStore::local(&local_path.unwrap(), self.config)?); blob_stores.add(local_lfs_store.clone()); @@ -631,7 +633,13 @@ mod tests { fn test_add_dropped() -> Result<()> { let cachedir = TempDir::new()?; let localdir = TempDir::new()?; - let config = make_config(&cachedir); + let mut config = make_config(&cachedir); + config.set( + "remotefilelog", + "write-local-to-indexedlog", + Some("False"), + &Default::default(), + ); let store = ContentStore::new(&localdir, &config)?; @@ -845,7 +853,13 @@ mod tests { fn test_add_shared_only_store() -> Result<()> { let cachedir = TempDir::new()?; let localdir = TempDir::new()?; - let config = make_config(&cachedir); + let mut config = make_config(&cachedir); + config.set( + "remotefilelog", + "write-local-to-indexedlog", + Some("False"), + &Default::default(), + ); let store = ContentStore::new(&localdir, &config)?; @@ -1038,6 +1052,18 @@ mod tests { let cachedir = TempDir::new()?; let localdir = TempDir::new()?; let mut config = make_config(&cachedir); + config.set( + "remotefilelog", + "write-local-to-indexedlog", + Some("False"), + &Default::default(), + ); + config.set( + "remotefilelog", + "write-hgcache-to-indexedlog", + Some("False"), + &Default::default(), + ); let k = key("a", "2"); let store_key = StoreKey::hgid(k.clone()); diff --git a/eden/scm/lib/revisionstore/src/metadatastore.rs b/eden/scm/lib/revisionstore/src/metadatastore.rs index 45a7cd2420..347ea34d9b 100644 --- a/eden/scm/lib/revisionstore/src/metadatastore.rs +++ b/eden/scm/lib/revisionstore/src/metadatastore.rs @@ -258,19 +258,20 @@ impl<'a> MetadataStoreBuilder<'a> { // - When pushing changes on a pushrebase server, the local linknode will become // incorrect, future fetches will put that change in the shared cache where the linknode // will be correct. - let primary: Arc = if self - .config - .get_or_default::("remotefilelog", "write-hgcache-to-indexedlog")? - { - // Put the indexedlog first, since recent data will have gone there. - historystore.add(shared_indexedloghistorystore.clone()); - historystore.add(shared_pack_store.clone()); - shared_indexedloghistorystore - } else { - historystore.add(shared_pack_store.clone()); - historystore.add(shared_indexedloghistorystore.clone()); - shared_pack_store - }; + let primary: Arc = + if self + .config + .get_or("remotefilelog", "write-hgcache-to-indexedlog", || true)? + { + // Put the indexedlog first, since recent data will have gone there. + historystore.add(shared_indexedloghistorystore.clone()); + historystore.add(shared_pack_store); + shared_indexedloghistorystore + } else { + historystore.add(shared_pack_store.clone()); + historystore.add(shared_indexedloghistorystore); + shared_pack_store + }; let local_mutablehistorystore: Option> = if let Some(unsuffixed_local_path) = self.local_path { @@ -285,19 +286,20 @@ impl<'a> MetadataStoreBuilder<'a> { &self.config, IndexedLogHistoryStoreType::Local, )?); - let primary: Arc = if self - .config - .get_or_default::("remotefilelog", "write-local-to-indexedlog")? - { - // Put the indexedlog first, since recent data will have gone there. - historystore.add(local_indexedloghistorystore.clone()); - historystore.add(local_pack_store); - local_indexedloghistorystore - } else { - historystore.add(local_pack_store.clone()); - historystore.add(local_indexedloghistorystore); - local_pack_store - }; + let primary: Arc = + if self + .config + .get_or("remotefilelog", "write-local-to-indexedlog", || true)? + { + // Put the indexedlog first, since recent data will have gone there. + historystore.add(local_indexedloghistorystore.clone()); + historystore.add(local_pack_store); + local_indexedloghistorystore + } else { + historystore.add(local_pack_store.clone()); + historystore.add(local_indexedloghistorystore); + local_pack_store + }; Some(primary) } else { diff --git a/eden/scm/tests/test-fb-hgext-remotefilelog-clone.t b/eden/scm/tests/test-fb-hgext-remotefilelog-clone.t index 2f3aeb522c..74318184f0 100644 --- a/eden/scm/tests/test-fb-hgext-remotefilelog-clone.t +++ b/eden/scm/tests/test-fb-hgext-remotefilelog-clone.t @@ -2,6 +2,7 @@ $ disable treemanifest $ setconfig remotenames.selectivepull=1 + $ setconfig remotefilelog.write-hgcache-to-indexedlog=False remotefilelog.write-local-to-indexedlog=False $ . "$TESTDIR/library.sh" diff --git a/eden/scm/tests/test-fb-hgext-remotefilelog-lfs-prefetch.t b/eden/scm/tests/test-fb-hgext-remotefilelog-lfs-prefetch.t index d6b689dd10..81f96cb7ab 100644 --- a/eden/scm/tests/test-fb-hgext-remotefilelog-lfs-prefetch.t +++ b/eden/scm/tests/test-fb-hgext-remotefilelog-lfs-prefetch.t @@ -2,6 +2,7 @@ $ disable treemanifest $ setconfig remotenames.selectivepull=1 + $ setconfig remotefilelog.write-hgcache-to-indexedlog=False remotefilelog.write-local-to-indexedlog=False $ LFSPATH=$TESTTMP/lfs $ export LFSPATH diff --git a/eden/scm/tests/test-fb-hgext-remotefilelog-lfs.t b/eden/scm/tests/test-fb-hgext-remotefilelog-lfs.t index 95bb79487a..79ffe809fa 100644 --- a/eden/scm/tests/test-fb-hgext-remotefilelog-lfs.t +++ b/eden/scm/tests/test-fb-hgext-remotefilelog-lfs.t @@ -3,6 +3,7 @@ $ disable treemanifest $ enable remotenames $ setconfig remotenames.selectivepull=1 + $ setconfig remotefilelog.write-hgcache-to-indexedlog=False remotefilelog.write-local-to-indexedlog=False $ . "$TESTDIR/library.sh" diff --git a/eden/scm/tests/test-fb-hgext-remotefilelog-linknodes.t b/eden/scm/tests/test-fb-hgext-remotefilelog-linknodes.t index 3582f1c8b0..014ae589cd 100644 --- a/eden/scm/tests/test-fb-hgext-remotefilelog-linknodes.t +++ b/eden/scm/tests/test-fb-hgext-remotefilelog-linknodes.t @@ -1,6 +1,7 @@ #chg-compatible $ disable treemanifest + $ setconfig remotefilelog.write-hgcache-to-indexedlog=False remotefilelog.write-local-to-indexedlog=False # Tests for the complicated linknode logic in remotefilelog.py::ancestormap() diff --git a/eden/scm/tests/test-fb-hgext-remotefilelog-pack-files.t b/eden/scm/tests/test-fb-hgext-remotefilelog-pack-files.t index 3f09d7662f..9a3aea95c5 100644 --- a/eden/scm/tests/test-fb-hgext-remotefilelog-pack-files.t +++ b/eden/scm/tests/test-fb-hgext-remotefilelog-pack-files.t @@ -1,6 +1,7 @@ #chg-compatible $ disable treemanifest + $ setconfig remotefilelog.write-hgcache-to-indexedlog=False remotefilelog.write-local-to-indexedlog=False $ shorttraceback diff --git a/eden/scm/tests/test-fb-hgext-remotefilelog-prefetch.t b/eden/scm/tests/test-fb-hgext-remotefilelog-prefetch.t index 403586a3ab..dc31804497 100644 --- a/eden/scm/tests/test-fb-hgext-remotefilelog-prefetch.t +++ b/eden/scm/tests/test-fb-hgext-remotefilelog-prefetch.t @@ -1,4 +1,5 @@ $ disable treemanifest + $ setconfig remotefilelog.write-hgcache-to-indexedlog=False remotefilelog.write-local-to-indexedlog=False #testcases vfscachestore simplecachestore $ . "$TESTDIR/library.sh" diff --git a/eden/scm/tests/test-fb-hgext-remotefilelog-repack-corrupt.t b/eden/scm/tests/test-fb-hgext-remotefilelog-repack-corrupt.t index f6f57e4991..52d9f4d25e 100644 --- a/eden/scm/tests/test-fb-hgext-remotefilelog-repack-corrupt.t +++ b/eden/scm/tests/test-fb-hgext-remotefilelog-repack-corrupt.t @@ -1,6 +1,7 @@ #chg-compatible $ disable treemanifest + $ setconfig remotefilelog.write-hgcache-to-indexedlog=False remotefilelog.write-local-to-indexedlog=False $ . "$TESTDIR/library.sh" diff --git a/eden/scm/tests/test-fb-hgext-remotefilelog-repack-fast.t b/eden/scm/tests/test-fb-hgext-remotefilelog-repack-fast.t index d68abf1df3..41e4d85ce0 100644 --- a/eden/scm/tests/test-fb-hgext-remotefilelog-repack-fast.t +++ b/eden/scm/tests/test-fb-hgext-remotefilelog-repack-fast.t @@ -1,6 +1,7 @@ #chg-compatible $ disable treemanifest + $ setconfig remotefilelog.write-hgcache-to-indexedlog=False remotefilelog.write-local-to-indexedlog=False $ . "$TESTDIR/library.sh" diff --git a/eden/scm/tests/test-fb-hgext-remotefilelog-repack-incremental-rust.t b/eden/scm/tests/test-fb-hgext-remotefilelog-repack-incremental-rust.t index 1610e50b96..a0caef8398 100644 --- a/eden/scm/tests/test-fb-hgext-remotefilelog-repack-incremental-rust.t +++ b/eden/scm/tests/test-fb-hgext-remotefilelog-repack-incremental-rust.t @@ -1,6 +1,7 @@ #chg-compatible $ disable treemanifest + $ setconfig remotefilelog.write-hgcache-to-indexedlog=False remotefilelog.write-local-to-indexedlog=False $ . "$TESTDIR/library.sh" diff --git a/eden/scm/tests/test-fb-hgext-remotefilelog-repack-remove-old.t b/eden/scm/tests/test-fb-hgext-remotefilelog-repack-remove-old.t index 68c3d6f56b..221f810a17 100644 --- a/eden/scm/tests/test-fb-hgext-remotefilelog-repack-remove-old.t +++ b/eden/scm/tests/test-fb-hgext-remotefilelog-repack-remove-old.t @@ -2,6 +2,7 @@ $ disable treemanifest $ . "$TESTDIR/library.sh" + $ setconfig remotefilelog.write-hgcache-to-indexedlog=False remotefilelog.write-local-to-indexedlog=False $ cat >> $HGRCPATH < [remotefilelog] diff --git a/eden/scm/tests/test-fb-hgext-remotefilelog-repack-rust.t b/eden/scm/tests/test-fb-hgext-remotefilelog-repack-rust.t index d50d03fb5f..ebe0cdde49 100644 --- a/eden/scm/tests/test-fb-hgext-remotefilelog-repack-rust.t +++ b/eden/scm/tests/test-fb-hgext-remotefilelog-repack-rust.t @@ -1,6 +1,7 @@ #chg-compatible $ . "$TESTDIR/library.sh" + $ setconfig remotefilelog.write-hgcache-to-indexedlog=False remotefilelog.write-local-to-indexedlog=False $ hginit master $ cd master diff --git a/eden/scm/tests/test-fb-hgext-remotefilelog-repack.t b/eden/scm/tests/test-fb-hgext-remotefilelog-repack.t index 732757e93c..3ef59b339c 100644 --- a/eden/scm/tests/test-fb-hgext-remotefilelog-repack.t +++ b/eden/scm/tests/test-fb-hgext-remotefilelog-repack.t @@ -1,6 +1,7 @@ #chg-compatible $ disable treemanifest + $ setconfig remotefilelog.write-hgcache-to-indexedlog=False remotefilelog.write-local-to-indexedlog=False $ . "$TESTDIR/library.sh" diff --git a/eden/scm/tests/test-fb-hgext-remotefilelog-rust-lfs.t b/eden/scm/tests/test-fb-hgext-remotefilelog-rust-lfs.t index 2a12529989..0bbdb0c99d 100644 --- a/eden/scm/tests/test-fb-hgext-remotefilelog-rust-lfs.t +++ b/eden/scm/tests/test-fb-hgext-remotefilelog-rust-lfs.t @@ -1,6 +1,7 @@ #chg-compatible $ . "$TESTDIR/library.sh" + $ setconfig remotefilelog.write-hgcache-to-indexedlog=False remotefilelog.write-local-to-indexedlog=False $ newserver master $ clone master shallow diff --git a/eden/scm/tests/test-fb-hgext-remotefilelog-ruststores-lfs-duplicated.t b/eden/scm/tests/test-fb-hgext-remotefilelog-ruststores-lfs-duplicated.t index 074e92a514..02098ec907 100644 --- a/eden/scm/tests/test-fb-hgext-remotefilelog-ruststores-lfs-duplicated.t +++ b/eden/scm/tests/test-fb-hgext-remotefilelog-ruststores-lfs-duplicated.t @@ -1,5 +1,7 @@ #chg-compatible + $ setconfig remotefilelog.write-hgcache-to-indexedlog=False remotefilelog.write-local-to-indexedlog=False + $ newserver master $ setconfig extensions.lfs= lfs.url=file:$TESTTMP/lfs-server diff --git a/eden/scm/tests/test-fb-hgext-remotefilelog-ruststores-lfs.t b/eden/scm/tests/test-fb-hgext-remotefilelog-ruststores-lfs.t index 725e789a81..dadc9c659a 100644 --- a/eden/scm/tests/test-fb-hgext-remotefilelog-ruststores-lfs.t +++ b/eden/scm/tests/test-fb-hgext-remotefilelog-ruststores-lfs.t @@ -1,6 +1,7 @@ #chg-compatible $ configure modern + $ setconfig remotefilelog.write-hgcache-to-indexedlog=False remotefilelog.write-local-to-indexedlog=False $ newserver master $ setconfig extensions.lfs= lfs.url=file:$TESTTMP/lfs-server diff --git a/eden/scm/tests/test-fb-hgext-remotefilelog-ruststores-repack.t b/eden/scm/tests/test-fb-hgext-remotefilelog-ruststores-repack.t index 928dc942c9..a7101d876b 100644 --- a/eden/scm/tests/test-fb-hgext-remotefilelog-ruststores-repack.t +++ b/eden/scm/tests/test-fb-hgext-remotefilelog-ruststores-repack.t @@ -1,6 +1,7 @@ #chg-compatible $ . "$TESTDIR/library.sh" + $ setconfig remotefilelog.write-hgcache-to-indexedlog=False remotefilelog.write-local-to-indexedlog=False $ newserver master diff --git a/eden/scm/tests/test-fb-hgext-remotefilelog-ruststores.t b/eden/scm/tests/test-fb-hgext-remotefilelog-ruststores.t index 91549cb409..3ed9ce7b4e 100644 --- a/eden/scm/tests/test-fb-hgext-remotefilelog-ruststores.t +++ b/eden/scm/tests/test-fb-hgext-remotefilelog-ruststores.t @@ -1,6 +1,7 @@ #chg-compatible $ . "$TESTDIR/library.sh" + $ setconfig remotefilelog.write-hgcache-to-indexedlog=False remotefilelog.write-local-to-indexedlog=False $ newserver master diff --git a/eden/scm/tests/test-fb-hgext-treemanifest-autoconvert.t b/eden/scm/tests/test-fb-hgext-treemanifest-autoconvert.t index d149b874b0..e1cc240cd8 100644 --- a/eden/scm/tests/test-fb-hgext-treemanifest-autoconvert.t +++ b/eden/scm/tests/test-fb-hgext-treemanifest-autoconvert.t @@ -1,5 +1,6 @@ $ . "$TESTDIR/library.sh" $ setconfig devel.print-metrics=1 + $ setconfig remotefilelog.write-hgcache-to-indexedlog=False remotefilelog.write-local-to-indexedlog=False $ hginit master diff --git a/eden/scm/tests/test-fb-hgext-treemanifest-convertflat.t b/eden/scm/tests/test-fb-hgext-treemanifest-convertflat.t index b77c154012..ed2d722540 100644 --- a/eden/scm/tests/test-fb-hgext-treemanifest-convertflat.t +++ b/eden/scm/tests/test-fb-hgext-treemanifest-convertflat.t @@ -1,6 +1,7 @@ #chg-compatible $ . "$TESTDIR/library.sh" + $ setconfig remotefilelog.write-hgcache-to-indexedlog=False remotefilelog.write-local-to-indexedlog=False $ cat >> $HGRCPATH < [treemanifest] diff --git a/eden/scm/tests/test-fb-hgext-treemanifest-infinitepush.t b/eden/scm/tests/test-fb-hgext-treemanifest-infinitepush.t index b991bd7a88..1e4d71e9f0 100644 --- a/eden/scm/tests/test-fb-hgext-treemanifest-infinitepush.t +++ b/eden/scm/tests/test-fb-hgext-treemanifest-infinitepush.t @@ -3,6 +3,7 @@ $ . "$TESTDIR/library.sh" $ . "$TESTDIR/infinitepush/library.sh" $ setconfig treemanifest.flatcompat=False + $ setconfig remotefilelog.write-hgcache-to-indexedlog=False remotefilelog.write-local-to-indexedlog=False $ setupcommon diff --git a/eden/scm/tests/test-fb-hgext-treemanifest-peertopeer.t b/eden/scm/tests/test-fb-hgext-treemanifest-peertopeer.t index 29475d513b..c0d6dea253 100644 --- a/eden/scm/tests/test-fb-hgext-treemanifest-peertopeer.t +++ b/eden/scm/tests/test-fb-hgext-treemanifest-peertopeer.t @@ -1,6 +1,7 @@ #chg-compatible $ CACHEDIR=`pwd`/hgcache + $ setconfig remotefilelog.write-hgcache-to-indexedlog=False remotefilelog.write-local-to-indexedlog=False $ . "$TESTDIR/library.sh" diff --git a/eden/scm/tests/test-fb-hgext-treemanifest-prefetch.t b/eden/scm/tests/test-fb-hgext-treemanifest-prefetch.t index d792af956a..f87077ece9 100644 --- a/eden/scm/tests/test-fb-hgext-treemanifest-prefetch.t +++ b/eden/scm/tests/test-fb-hgext-treemanifest-prefetch.t @@ -3,6 +3,7 @@ $ CACHEDIR=`pwd`/hgcache $ . "$TESTDIR/library.sh" + $ setconfig remotefilelog.write-hgcache-to-indexedlog=False remotefilelog.write-local-to-indexedlog=False $ enable remotenames $ hginit master diff --git a/eden/scm/tests/test-fb-hgext-treemanifest-pushrebase-treeonly.t b/eden/scm/tests/test-fb-hgext-treemanifest-pushrebase-treeonly.t index 6a70c0df3d..9007e56859 100644 --- a/eden/scm/tests/test-fb-hgext-treemanifest-pushrebase-treeonly.t +++ b/eden/scm/tests/test-fb-hgext-treemanifest-pushrebase-treeonly.t @@ -4,6 +4,7 @@ Push treeonly commits from a treeonly shallow repo to a treeonly server $ setconfig remotefilelog.reponame=x remotefilelog.cachepath=$TESTTMP/cache $ setconfig treemanifest.flatcompat=False + $ setconfig remotefilelog.write-hgcache-to-indexedlog=False remotefilelog.write-local-to-indexedlog=False $ configure dummyssh $ newrepo server diff --git a/eden/scm/tests/test-fb-hgext-treemanifest-repack.t b/eden/scm/tests/test-fb-hgext-treemanifest-repack.t index 51040887a2..19524d12ec 100644 --- a/eden/scm/tests/test-fb-hgext-treemanifest-repack.t +++ b/eden/scm/tests/test-fb-hgext-treemanifest-repack.t @@ -1,6 +1,7 @@ #chg-compatible $ enable amend + $ setconfig remotefilelog.write-hgcache-to-indexedlog=False remotefilelog.write-local-to-indexedlog=False $ . "$TESTDIR/library.sh" diff --git a/eden/scm/tests/test-fb-hgext-treemanifest-sendtrees.t b/eden/scm/tests/test-fb-hgext-treemanifest-sendtrees.t index 417435dc85..2484d44fcb 100644 --- a/eden/scm/tests/test-fb-hgext-treemanifest-sendtrees.t +++ b/eden/scm/tests/test-fb-hgext-treemanifest-sendtrees.t @@ -1,6 +1,7 @@ #chg-compatible $ . "$TESTDIR/library.sh" + $ setconfig remotefilelog.write-hgcache-to-indexedlog=False remotefilelog.write-local-to-indexedlog=False $ cat >> $HGRCPATH < [extensions] diff --git a/eden/scm/tests/test-fb-hgext-treemanifest-server.t b/eden/scm/tests/test-fb-hgext-treemanifest-server.t index dc09230e2d..bc367a8316 100644 --- a/eden/scm/tests/test-fb-hgext-treemanifest-server.t +++ b/eden/scm/tests/test-fb-hgext-treemanifest-server.t @@ -4,6 +4,7 @@ #testcases vfscachestore simplecachestore $ setconfig treemanifest.flatcompat=False + $ setconfig remotefilelog.write-hgcache-to-indexedlog=False remotefilelog.write-local-to-indexedlog=False $ configure mutation-norecord $ . "$TESTDIR/library.sh" diff --git a/eden/scm/tests/test-fb-hgext-treemanifest-treeonly.t b/eden/scm/tests/test-fb-hgext-treemanifest-treeonly.t index f32ee853d0..0e72d4abea 100644 --- a/eden/scm/tests/test-fb-hgext-treemanifest-treeonly.t +++ b/eden/scm/tests/test-fb-hgext-treemanifest-treeonly.t @@ -1,6 +1,7 @@ #chg-compatible $ setconfig treemanifest.flatcompat=False remotefilelog.localdatarepack=True + $ setconfig remotefilelog.write-hgcache-to-indexedlog=False remotefilelog.write-local-to-indexedlog=False $ . "$TESTDIR/library.sh" Setup the server diff --git a/eden/scm/tests/test-fb-hgext-treemanifest.t b/eden/scm/tests/test-fb-hgext-treemanifest.t index 1bdf3807d2..7a9e8f98d1 100644 --- a/eden/scm/tests/test-fb-hgext-treemanifest.t +++ b/eden/scm/tests/test-fb-hgext-treemanifest.t @@ -1,6 +1,7 @@ #chg-compatible $ . "$TESTDIR/library.sh" + $ setconfig remotefilelog.write-hgcache-to-indexedlog=False remotefilelog.write-local-to-indexedlog=False $ hginit master diff --git a/eden/scm/tests/test-treemanifest-amend.t b/eden/scm/tests/test-treemanifest-amend.t index 75acc94fa8..f87df3ff06 100644 --- a/eden/scm/tests/test-treemanifest-amend.t +++ b/eden/scm/tests/test-treemanifest-amend.t @@ -5,6 +5,7 @@ Crash in histpack code path where the amend destination already exists $ configure mutation-norecord $ enable undo treemanifest remotefilelog $ setconfig treemanifest.treeonly=1 remotefilelog.reponame=foo remotefilelog.cachepath=$TESTTMP/cache + $ setconfig remotefilelog.write-hgcache-to-indexedlog=False remotefilelog.write-local-to-indexedlog=False $ newrepo $ drawdag << 'EOS' > B