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

merge: don't auto-pick destination with `hg merge 'wdir()'`...

merge: don't auto-pick destination with `hg merge 'wdir()'` If the user doesn't specify a commit to merge with, we'll have `node==None` in `commands.merge()`. We'll then try to find a good commit to merge with. However, if the user, for some strange reason, runs `hg merge 'wdir()'`, we'll also have `node==None` and we'll do that same. That's clearly not the intent, so let's not do that. It turns out we'd instead crash on that command after this patch, so I added special handling of it too. Differential Revision: https://phab.mercurial-scm.org/D7996

Gregory Szorc - - Load All Authors

File last commit:

r37513:b1fb341d default


                r44638:1850066f

default

Download file

             zbuff_common.c
        
                    26 lines
            
             | 1003 B
            
                | text/x-c
            
             |
                CLexer
            
             / contrib / python-zstandard / zstd / deprecated / zbuff_common.c
          
                    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.

       */

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

      *  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

				/*
				* 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); }