upstream/mercurial-mirror Files · contrib/python-zstandard/zstd/decompress/zstd_decompress_block.h

copies: filter invalid copies only at end of pathcopies() (issue6163)...

copies: filter invalid copies only at end of pathcopies() (issue6163) copies._filter() filters out copies whose source file does not exist in the start commit or whose target file does not exist in the end commit. We do that after chaining copies with dirstate copies or backward renames from another branch. We also do at the end of the changeset-centric copy tracing. The filtering means that we will remove copies to/from files that did not exist in some intermediate commit. That is inconsistent with what we do if a file has been deleted and then re-added (we allow updating across that). Copying the two first examples from issue6163: @ 4 'rename x to y' | o 3 'add x again' | o 2 'remove x' | | o 1 'modify x' |/ o 0 'add x' @ 4 'rename x to y' | o 3 'add x again' | | o 2 'modify x' | | | o 1 'add x' |/ o 0 'base' When doing `hg rebase -r 1 -d 4` in the first case, it succeeds, but `hg rebase -r 2 -d 4` in the second case does not. That's because we chain and filter via commit 0, which does not have file 'x' in the second case. IMO, that's clearly inconsistent. So this patch removes the filtering step so it only happens at the end. If a file was temporarily removed, whether via a merge base or not, it will now still be considered the same file. That fixes issue6163 for the changeset-centric case. Differential Revision: https://phab.mercurial-scm.org/D6603

Gregory Szorc - - Load All Authors

File last commit:

r42237:675775c3 default


                r42797:d013099c

default

Download file

             zstd_decompress_block.h
        
                    59 lines
            
             | 2.0 KiB
            
                | text/x-c
            
             |
                CLexer
            
             / contrib / python-zstandard / zstd / decompress / zstd_decompress_block.h
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      /*

       * Copyright (c) 2016-present, Yann Collet, Facebook, Inc.

       * All rights reserved.

       *

       * This source code is licensed under both the BSD-style license (found in the

       * LICENSE file in the root directory of this source tree) and the GPLv2 (found

       * in the COPYING file in the root directory of this source tree).

       * You may select, at your option, one of the above-listed licenses.

       */

      #ifndef ZSTD_DEC_BLOCK_H

      #define ZSTD_DEC_BLOCK_H

      /*-*******************************************************

       *  Dependencies

       *********************************************************/

      #include <stddef.h>   /* size_t */

      #include "zstd.h"    /* DCtx, and some public functions */

      #include "zstd_internal.h"  /* blockProperties_t, and some public functions */

      #include "zstd_decompress_internal.h"  /* ZSTD_seqSymbol */

      /* ===   Prototypes   === */

      /* note: prototypes already published within `zstd.h` :

       * ZSTD_decompressBlock()

       */

      /* note: prototypes already published within `zstd_internal.h` :

       * ZSTD_getcBlockSize()

       * ZSTD_decodeSeqHeaders()

       */

      /* ZSTD_decompressBlock_internal() :

       * decompress block, starting at `src`,

       * into destination buffer `dst`.

       * @return : decompressed block size,

       *           or an error code (which can be tested using ZSTD_isError())

       */

      size_t ZSTD_decompressBlock_internal(ZSTD_DCtx* dctx,

                                     void* dst, size_t dstCapacity,

                               const void* src, size_t srcSize, const int frame);

      /* ZSTD_buildFSETable() :

       * generate FSE decoding table for one symbol (ll, ml or off)

       * this function must be called with valid parameters only

       * (dt is large enough, normalizedCounter distribution total is a power of 2, max is within range, etc.)

       * in which case it cannot fail.

       * Internal use only.

       */

      void ZSTD_buildFSETable(ZSTD_seqSymbol* dt,

                   const short* normalizedCounter, unsigned maxSymbolValue,

                   const U32* baseValue, const U32* nbAdditionalBits,

                         unsigned tableLog);

      #endif /* ZSTD_DEC_BLOCK_H */

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

				/*
				* Copyright (c) 2016-present, Yann Collet, Facebook, Inc.
				* All rights reserved.
				*
				* This source code is licensed under both the BSD-style license (found in the
				* LICENSE file in the root directory of this source tree) and the GPLv2 (found
				* in the COPYING file in the root directory of this source tree).
				* You may select, at your option, one of the above-listed licenses.
				*/


				#ifndef ZSTD_DEC_BLOCK_H
				#define ZSTD_DEC_BLOCK_H

				/-******************************************************
				* Dependencies
				*********************************************************/
				#include <stddef.h> /* size_t */
				#include "zstd.h" /* DCtx, and some public functions */
				#include "zstd_internal.h" /* blockProperties_t, and some public functions */
				#include "zstd_decompress_internal.h" /* ZSTD_seqSymbol */


				/* === Prototypes === */

				/* note: prototypes already published within `zstd.h` :
				* ZSTD_decompressBlock()
				*/

				/* note: prototypes already published within `zstd_internal.h` :
				* ZSTD_getcBlockSize()
				* ZSTD_decodeSeqHeaders()
				*/


				/* ZSTD_decompressBlock_internal() :
				* decompress block, starting at `src`,
				* into destination buffer `dst`.
				* @return : decompressed block size,
				* or an error code (which can be tested using ZSTD_isError())
				*/
				size_t ZSTD_decompressBlock_internal(ZSTD_DCtx* dctx,
				void* dst, size_t dstCapacity,
				const void* src, size_t srcSize, const int frame);

				/* ZSTD_buildFSETable() :
				* generate FSE decoding table for one symbol (ll, ml or off)
				* this function must be called with valid parameters only
				* (dt is large enough, normalizedCounter distribution total is a power of 2, max is within range, etc.)
				* in which case it cannot fail.
				* Internal use only.
				*/
				void ZSTD_buildFSETable(ZSTD_seqSymbol* dt,
				const short* normalizedCounter, unsigned maxSymbolValue,
				const U32* baseValue, const U32* nbAdditionalBits,
				unsigned tableLog);


				#endif /* ZSTD_DEC_BLOCK_H */