D3095: simplestore: use a custom store for the simple store repo

2018-04-06 Thread indygreg (Gregory Szorc)
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGc2c8962a9465: simplestore: use a custom store for the 
simple store repo (authored by indygreg, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D3095?vs=7677&id=7821

REVISION DETAIL
  https://phab.mercurial-scm.org/D3095

AFFECTED FILES
  tests/hghave.py
  tests/simplestorerepo.py
  tests/test-clone.t
  tests/test-convert.t
  tests/test-fncache.t
  tests/test-hardlinks.t
  tests/test-hook.t
  tests/test-inherit-mode.t
  tests/test-init.t
  tests/test-narrow-clone-no-ellipsis.t
  tests/test-narrow-clone.t
  tests/test-narrow.t
  tests/test-repo-compengines.t
  tests/test-sparse-requirement.t
  tests/test-strip.t
  tests/test-subrepo-deep-nested-change.t
  tests/test-subrepo-recursion.t
  tests/test-treemanifest.t

CHANGE DETAILS

diff --git a/tests/test-treemanifest.t b/tests/test-treemanifest.t
--- a/tests/test-treemanifest.t
+++ b/tests/test-treemanifest.t
@@ -557,6 +557,7 @@
   checking files
   8 files, 4 changesets, 18 total revisions
 
+#if repofncache
 Dirlogs are included in fncache
   $ grep meta/.A/00manifest.i .hg/store/fncache
   meta/.A/00manifest.i
@@ -581,6 +582,7 @@
   adding meta/b/foo/apple/00manifest.i
   adding meta/b/foo/apple/bees/00manifest.i
   16 items added, 0 removed from fncache
+#endif
 
 Finish first server
   $ killdaemons.py
diff --git a/tests/test-subrepo-recursion.t b/tests/test-subrepo-recursion.t
--- a/tests/test-subrepo-recursion.t
+++ b/tests/test-subrepo-recursion.t
@@ -466,7 +466,6 @@
   linking [  <=> ] 10\r (no-eol) (esc) 
(reposimplestore !)
   linking [   <=>] 11\r (no-eol) (esc) 
(reposimplestore !)
   linking [<=>   ] 12\r (no-eol) (esc) 
(reposimplestore !)
-  linking [ <=>  ] 13\r (no-eol) (esc) 
(reposimplestore !)
   \r (no-eol) (esc)
 #else
   $ hg clone -U . ../empty
@@ -498,7 +497,6 @@
   linking [<=>   ] 12\r (no-eol) (esc) 
(reposimplestore !)
   linking [ <=>  ] 13\r (no-eol) (esc) 
(reposimplestore !)
   linking [  <=> ] 14\r (no-eol) (esc) 
(reposimplestore !)
-  linking [   <=>] 15\r (no-eol) (esc) 
(reposimplestore !)
   \r (no-eol) (esc)
   \r (no-eol) (esc)
   archiving (foo) [ ] 0/3\r (no-eol) (esc)
@@ -515,7 +513,6 @@
   linking [  <=>  ] 6\r (no-eol) (esc)
   linking [   <=> ] 7\r (no-eol) (esc) 
(reposimplestore !)
   linking [<=>] 8\r (no-eol) (esc) 
(reposimplestore !)
-  linking [ <=>   ] 9\r (no-eol) (esc) 
(reposimplestore !)
   \r (no-eol) (esc)
   \r (no-eol) (esc)
   archiving (foo/bar) [ ] 0/1\r (no-eol) (esc)
diff --git a/tests/test-subrepo-deep-nested-change.t 
b/tests/test-subrepo-deep-nested-change.t
--- a/tests/test-subrepo-deep-nested-change.t
+++ b/tests/test-subrepo-deep-nested-change.t
@@ -34,7 +34,6 @@
   linking [<=>] 4\r (no-eol) (esc)
   linking [ <=>   ] 5\r (no-eol) (esc)
   linking [  <=>  ] 6\r (no-eol) (esc)
-  linking [   <=> ] 7\r (no-eol) (esc) 
(reposimplestore !)
   \r (no-eol) (esc)
   \r (no-eol) (esc)
   updating [===>] 1/1\r (no-eol) (esc)
@@ -63,7 +62,6 @@
   linking [<=>] 8\r (no-eol) (esc)
   linking [ <=>   ] 9\r (no-eol) (esc) 
(reposimplestore !)
   linking [  <=> ] 10\r (no-eol) (esc) 
(reposimplestore !)
-  linking [   <=>] 11\r (no-eol) (esc) 
(reposimplestore !)
   \r (no-eol) (esc)
   \r (no-eol) (esc)
   updating [===>] 3/3\r (no-eol) (esc)
@@ -75,7 +73,6 @@
   linking [<=>] 4\r (no-eol) (esc)
   linking [ <=>   ] 5\r (no-eol) (esc)
   linking [  <=>  ] 6\r (no-eol) (esc)
-  linking [   <=> ] 7\r (no-eol) (esc) 
(reposimplestore !)
   updating [==

D3095: simplestore: use a custom store for the simple store repo

2018-04-04 Thread indygreg (Gregory Szorc)
indygreg created this revision.
Herald added a reviewer: durin42.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION SUMMARY
  Before, we used the default store, which was based on fncache
  and dotencode. After attempting to port tests to work with the
  simple store, I realized that fncache was more trouble than it is
  worth.
  
  This commit implements a proper store type for the simple repo -
  one that isn't based off fncache.
  
  This causes a number of new test failures because of tests
  expecting the full fncache store filename encoding. I may
  extend the store format in a subsequent commit to take the
  filename encoding parts of fncache that we can take
  (basically everything except hash encoding, since that isn't
  reversible). But for now, let's use encoded store.
  
  As part of this, we implement proper requirements support for
  repos created with the simple store. This should have been
  done from the beginning, as a requirement is needed to lock
  out clients that don't understand a storage format.
  
  A new hghave feature advertising the presence of fncache in repos
  has been added. Most tests touching the fncache are now conditional
  on that feature.
  
  Other tests have added the optional repo requirement to output.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D3095

AFFECTED FILES
  tests/hghave.py
  tests/simplestorerepo.py
  tests/test-clone.t
  tests/test-convert.t
  tests/test-fncache.t
  tests/test-hardlinks.t
  tests/test-hook.t
  tests/test-inherit-mode.t
  tests/test-init.t
  tests/test-narrow-clone-no-ellipsis.t
  tests/test-narrow-clone.t
  tests/test-narrow.t
  tests/test-repo-compengines.t
  tests/test-sparse-requirement.t
  tests/test-strip.t
  tests/test-subrepo-deep-nested-change.t
  tests/test-subrepo-recursion.t
  tests/test-treemanifest.t

CHANGE DETAILS

diff --git a/tests/test-treemanifest.t b/tests/test-treemanifest.t
--- a/tests/test-treemanifest.t
+++ b/tests/test-treemanifest.t
@@ -557,6 +557,7 @@
   checking files
   8 files, 4 changesets, 18 total revisions
 
+#if repofncache
 Dirlogs are included in fncache
   $ grep meta/.A/00manifest.i .hg/store/fncache
   meta/.A/00manifest.i
@@ -581,6 +582,7 @@
   adding meta/b/foo/apple/00manifest.i
   adding meta/b/foo/apple/bees/00manifest.i
   16 items added, 0 removed from fncache
+#endif
 
 Finish first server
   $ killdaemons.py
diff --git a/tests/test-subrepo-recursion.t b/tests/test-subrepo-recursion.t
--- a/tests/test-subrepo-recursion.t
+++ b/tests/test-subrepo-recursion.t
@@ -466,7 +466,6 @@
   linking [  <=> ] 10\r (no-eol) (esc) 
(reposimplestore !)
   linking [   <=>] 11\r (no-eol) (esc) 
(reposimplestore !)
   linking [<=>   ] 12\r (no-eol) (esc) 
(reposimplestore !)
-  linking [ <=>  ] 13\r (no-eol) (esc) 
(reposimplestore !)
   \r (no-eol) (esc)
 #else
   $ hg clone -U . ../empty
@@ -498,7 +497,6 @@
   linking [<=>   ] 12\r (no-eol) (esc) 
(reposimplestore !)
   linking [ <=>  ] 13\r (no-eol) (esc) 
(reposimplestore !)
   linking [  <=> ] 14\r (no-eol) (esc) 
(reposimplestore !)
-  linking [   <=>] 15\r (no-eol) (esc) 
(reposimplestore !)
   \r (no-eol) (esc)
   \r (no-eol) (esc)
   archiving (foo) [ ] 0/3\r (no-eol) (esc)
@@ -515,7 +513,6 @@
   linking [  <=>  ] 6\r (no-eol) (esc)
   linking [   <=> ] 7\r (no-eol) (esc) 
(reposimplestore !)
   linking [<=>] 8\r (no-eol) (esc) 
(reposimplestore !)
-  linking [ <=>   ] 9\r (no-eol) (esc) 
(reposimplestore !)
   \r (no-eol) (esc)
   \r (no-eol) (esc)
   archiving (foo/bar) [ ] 0/1\r (no-eol) (esc)
diff --git a/tests/test-subrepo-deep-nested-change.t 
b/tests/test-subrepo-deep-nested-change.t
--- a/tests/test-subrepo-deep-nested-change.t
+++ b/tests/test-subrepo-deep-nested-change.t
@@ -34,7 +34,6 @@
   linking [<=>] 4\r (no-eol) (esc)
   linking [ <=>   ] 5\r (no-eol) (esc)
   linking [  <=>  ] 6\r (no-eol) (esc)
-  linking [   <=> ] 7\r (no-eol) (esc) 
(reposimplestore !)
   \r (no-eol) (esc)
   \r (no-eol) (esc)
   updating [=