[PATCH 7 of 7 F2 series] localrepo: create fncache2 repos
Adrian Buehlmann
adrian at cadifra.com
Sat Oct 6 17:25:04 CDT 2012
# HG changeset patch
# User Adrian Buehlmann <adrian at cadifra.com>
# Date 1349543610 -7200
# Node ID 2689f051218300ff94b46758b5b446274f1bb1c2
# Parent 2ecbfb711ab2987eb700261933ac1baf00cc10f4
localrepo: create fncache2 repos
diff --git a/mercurial/localrepo.py b/mercurial/localrepo.py
--- a/mercurial/localrepo.py
+++ b/mercurial/localrepo.py
@@ -109,7 +109,7 @@
supportedformats = set(('revlogv1', 'generaldelta'))
supported = supportedformats | set(('store', 'fncache', 'shared',
- 'dotencode'))
+ 'dotencode', 'fncache2'))
openerreqs = set(('revlogv1', 'generaldelta'))
requirements = ['revlogv1']
@@ -147,9 +147,7 @@
self.vfs.mkdir("store")
requirements.append("store")
if self.ui.configbool('format', 'usefncache', True):
- requirements.append("fncache")
- if self.ui.configbool('format', 'dotencode', True):
- requirements.append('dotencode')
+ requirements.append("fncache2")
# create an invalid changelog
self.vfs.append(
"00changelog.i",
diff --git a/tests/test-fncache.t b/tests/test-fncache.t
--- a/tests/test-fncache.t
+++ b/tests/test-fncache.t
@@ -18,7 +18,7 @@
$ hg ci -m second
$ cat .hg/store/fncache | sort
data/a.i
- data/a.i.hg/b.i
+ data/a.i/b.i
Testing a.i.hg/c:
@@ -29,8 +29,8 @@
$ hg ci -m third
$ cat .hg/store/fncache | sort
data/a.i
- data/a.i.hg.hg/c.i
- data/a.i.hg/b.i
+ data/a.i.hg/c.i
+ data/a.i/b.i
Testing verify:
diff --git a/tests/test-init.t b/tests/test-init.t
--- a/tests/test-init.t
+++ b/tests/test-init.t
@@ -18,10 +18,9 @@
$ checknewrepo local
store created
00changelog.i created
+ fncache2
revlogv1
- fncache
store
- dotencode
$ echo this > local/foo
$ hg ci --cwd local -A -m "init"
adding foo
@@ -47,8 +46,8 @@
$ checknewrepo old3
store created
00changelog.i created
+ fncache2
revlogv1
- fncache
store
test failure
@@ -149,10 +148,9 @@
$ checknewrepo local/sub/repo
store created
00changelog.i created
+ fncache2
revlogv1
- fncache
store
- dotencode
prepare test of init of url configured from paths
@@ -166,10 +164,9 @@
$ checknewrepo "url from paths"
store created
00changelog.i created
+ fncache2
revlogv1
- fncache
store
- dotencode
verify that clone also expand urls
@@ -179,10 +176,9 @@
$ checknewrepo "another paths url"
store created
00changelog.i created
+ fncache2
revlogv1
- fncache
store
- dotencode
clone bookmarks
diff --git a/tests/test-lfconvert.t b/tests/test-lfconvert.t
--- a/tests/test-lfconvert.t
+++ b/tests/test-lfconvert.t
@@ -93,10 +93,9 @@
"lfconvert" adds 'largefiles' to .hg/requires.
$ cat .hg/requires
largefiles
+ fncache2
revlogv1
- fncache
store
- dotencode
"lfconvert" includes a newline at the end of the standin files.
$ cat .hglf/large .hglf/sub/maybelarge.dat
More information about the Mercurial-devel
mailing list