[PATCH 6 of 7 F2 series] store: implement new fncache2 requirement

Adrian Buehlmann adrian at cadifra.com
Sat Oct 6 17:48:58 CDT 2012


On 2012-10-07 00:25, Adrian Buehlmann wrote:
> # HG changeset patch
> # User Adrian Buehlmann <adrian at cadifra.com>
> # Date 1349033428 -7200
> # Node ID 2ecbfb711ab2987eb700261933ac1baf00cc10f4
> # Parent  84dedf0a19d850859fc773a1b56c58a82eb16e8c
> store: implement new fncache2 requirement
> 
> not yet used
> 
> diff --git a/mercurial/store.py b/mercurial/store.py
> --- a/mercurial/store.py
> +++ b/mercurial/store.py
> @@ -494,6 +494,8 @@
>  
>  class fncachestore(basicstore):
>      def __init__(self, path, vfstype, version):
> +        if version == 2:
> +            encode = _hybridencode2
>          if version == 1:
>              encode = _dothybridencode
>          else:

There is a really stupid bug. This should be:

        if version == 2:
            encode = _hybridencode2
        elif version == 1:
            encode = _dothybridencode
        else:
            encode = _plainhybridencode

> @@ -544,7 +546,9 @@
>  
>  def store(requirements, path, vfstype):
>      if 'store' in requirements:
> -        if 'fncache' in requirements:
> +        if 'fncache2' in requirements:
> +            return fncachestore(path, vfstype, version=2)
> +        elif 'fncache' in requirements:
>              if 'dotencode' in requirements:
>                  version = 1
>              else:


More information about the Mercurial-devel mailing list