upstream/mercurial-mirror Files · contrib/python-zstandard/zstd/deprecated/zbuff_common.c

simplemerge: move printing of merge result to extension...

simplemerge: move printing of merge result to extension The `mercurial.simplemerge` module still has some command-lines processing that doesn't belong in such a low-level module. This patch moves the handling of `hg simplemerge --print` to the extension by having `mercurial.simplemerge.simplemerge()` return the merged text. Differential Revision: https://phab.mercurial-scm.org/D12148

Gregory Szorc - - Load All Authors

File last commit:

r37513:b1fb341d default


                r49599:6ae3c97a

default

Download file

             zbuff_common.c
        
                    26 lines
            
             | 1003 B
            
                | text/x-c
            
             |
                CLexer
            
             / contrib / python-zstandard / zstd / deprecated / zbuff_common.c
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Gregory Szorc
    
zstandard: vendor python-zstandard 0.9.0...

              r37513
            
      /*

       * 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.

       */

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

      *  Dependencies

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

      #include "error_private.h"

      #include "zbuff.h"

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

      *  ZBUFF Error Management  (deprecated)

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

      /*! ZBUFF_isError() :

      *   tells if a return value is an error code */

      unsigned ZBUFF_isError(size_t errorCode) { return ERR_isError(errorCode); }

      /*! ZBUFF_getErrorName() :

      *   provides error code string from function result (useful for debugging) */

      const char* ZBUFF_getErrorName(size_t errorCode) { return ERR_getErrorName(errorCode); }

	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

Gregory Szorc zstandard: vendor python-zstandard 0.9.0...	r37513	/*
		* 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.
		*/

		/-************************************
		* Dependencies
		***************************************/
		#include "error_private.h"
		#include "zbuff.h"

		/-***************************************
		* ZBUFF Error Management (deprecated)
		******************************************/

		/*! ZBUFF_isError() :
		* tells if a return value is an error code */
		unsigned ZBUFF_isError(size_t errorCode) { return ERR_isError(errorCode); }
		/*! ZBUFF_getErrorName() :
		* provides error code string from function result (useful for debugging) */
		const char* ZBUFF_getErrorName(size_t errorCode) { return ERR_getErrorName(errorCode); }