# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1218676723 18000
# Node ID faea0d27e38fb1a61ab35982d9d46c77b58b8680
# Parent  40690d614ce603bba356b22c42f0491edda11c51
statichttp: use store class

This lets us nix store.encodefn.

diff -r 40690d614ce6 -r faea0d27e38f mercurial/statichttprepo.py
--- a/mercurial/statichttprepo.py	Wed Aug 13 20:18:42 2008 -0500
+++ b/mercurial/statichttprepo.py	Wed Aug 13 20:18:43 2008 -0500
@@ -54,14 +54,10 @@
                 raise repo.RepoError(_("requirement '%s' not supported") % r)
 
         # setup store
-        if "store" in requirements:
-            self.spath = self.path + "/store"
-        else:
-            self.spath = self.path
-        self.encodefn = store.encodefn(requirements)
-        so = opener(self.spath)
-        self.sopener = lambda path, *args, **kw: so(
-            self.encodefn(path), *args, **kw)
+        self.store = store.store(requirements, self.path, opener)
+        self.spath = self.store.path
+        self.sopener = self.store.opener
+        self.sjoin = self.store.join
 
         self.manifest = manifest.manifest(self.sopener)
         self.changelog = changelog.changelog(self.sopener)
diff -r 40690d614ce6 -r faea0d27e38f mercurial/store.py
--- a/mercurial/store.py	Wed Aug 13 20:18:42 2008 -0500
+++ b/mercurial/store.py	Wed Aug 13 20:18:43 2008 -0500
@@ -119,12 +119,6 @@
     def join(self, f):
         return os.path.join(self.path, self.encodefn(f))
 
-def encodefn(requirements):
-    if 'store' not in requirements:
-        return lambda x: x
-    else:
-        return encodefilename
-
 def store(requirements, path, opener):
     if 'store' not in requirements:
         return directstore(path, opener)