upstream/mercurial-mirror Files · mercurial/thirdparty/xdiff/xdiff.h

lfs: bypass wrapped functions when reposetup() hasn't been called (issue5902)...

lfs: bypass wrapped functions when reposetup() hasn't been called (issue5902) There are only a handful of methods that access repo attributes that are applied in reposetup(). The `diff` test covers all of the commands that call scmutil.prefetchfiles(). Along the way, I saw that adding files and upgrading the repo format were also problems (also tested here). I don't think running `hg serve` through the commandserver is sane, but I conditionalized both the capabilities and the wsgirequest handler because it's trivially correct. It doesn't look like there has ever been a caller of candownload(), so there's no test for that path. The upload case isn't testable, because uploadblobs() bails if there are no pointers. The requirement should be added any time pointers are introduced, and that would force the extension to be loaded specifically for the repo. This covers `debuglfsupload`, the pre-push hook (which isn't set until the repo is promoted to LFS), and uploadblobsfromrevs(), which can be called by other extensions. I think readfromstore() and writetostore() are only reachable as a flag processor for revlog.REVIDX_EXTSTORED, and a requirement is added as soon as that is seen, so I don't think those are a problem.

Jun Wu - - Load All Authors

File last commit:

r36782:3cf40112 default


                r38199:3790efb3

stable

Download file

             xdiff.h
        
                    91 lines
            
             | 2.3 KiB
            
                | text/x-c
            
             |
                CLexer
            
             / mercurial / thirdparty / xdiff / xdiff.h
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Jun Wu
    
xdiff: vendor xdiff library from git...

              r36689
            
      /*

       *  LibXDiff by Davide Libenzi ( File Differential Library )

       *  Copyright (C) 2003  Davide Libenzi

       *

       *  This library is free software; you can redistribute it and/or

       *  modify it under the terms of the GNU Lesser General Public

       *  License as published by the Free Software Foundation; either

       *  version 2.1 of the License, or (at your option) any later version.

       *

       *  This library is distributed in the hope that it will be useful,

       *  but WITHOUT ANY WARRANTY; without even the implied warranty of

       *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

       *  Lesser General Public License for more details.

       *

       *  You should have received a copy of the GNU Lesser General Public

       *  License along with this library; if not, see

       *  <http://www.gnu.org/licenses/>.

       *

       *  Davide Libenzi <davidel@xmailserver.org>

       *

       */

      #if !defined(XDIFF_H)

      #define XDIFF_H

      #ifdef __cplusplus

      extern "C" {

      #endif /* #ifdef __cplusplus */

        Jun Wu
    
xdiff: remove patience and histogram diff algorithms...

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

        Jun Wu
    
xdiff: move stdint.h to xdiff.h...

              r36954
            
      #if !defined(_MSC_VER) || _MSC_VER >= 1600

      #include <stdint.h>

      #else

      /* prior to Visual Studio 2010 */

      typedef long long int64_t;

      typedef unsigned long long uint64_t;

      #endif

        Jun Wu
    
xdiff: vendor xdiff library from git...

              r36689
            
      /* xpparm_t.flags */

      #define XDF_NEED_MINIMAL (1 << 0)

      #define XDF_INDENT_HEURISTIC (1 << 23)

        Jun Wu
    
xdiff: add a bdiff hunk mode...

              r36691
            
      /* emit bdiff-style "matched" (a1, a2, b1, b2) hunks instead of "different"

       * (a1, a2 - a1, b1, b2 - b1) hunks */

      #define XDL_EMIT_BDIFFHUNK (1 << 4)

        Jun Wu
    
xdiff: vendor xdiff library from git...

              r36689
            
      typedef struct s_mmfile {

      	char *ptr;

        Jun Wu
    
xdiff: replace {unsigned ,}long with {u,}int64_t...

              r36840
            
      	int64_t size;

        Jun Wu
    
xdiff: vendor xdiff library from git...

              r36689
            
      } mmfile_t;

      typedef struct s_mmbuffer {

      	char *ptr;

        Jun Wu
    
xdiff: replace {unsigned ,}long with {u,}int64_t...

              r36840
            
      	int64_t size;

        Jun Wu
    
xdiff: vendor xdiff library from git...

              r36689
            
      } mmbuffer_t;

      typedef struct s_xpparam {

        Jun Wu
    
xdiff: replace {unsigned ,}long with {u,}int64_t...

              r36840
            
      	uint64_t flags;

        Jun Wu
    
xdiff: vendor xdiff library from git...

              r36689
            
      } xpparam_t;

      typedef struct s_xdemitcb {

      	void *priv;

      } xdemitcb_t;

        Jun Wu
    
xdiff: replace {unsigned ,}long with {u,}int64_t...

              r36840
            
      typedef int (*xdl_emit_hunk_consume_func_t)(int64_t start_a, int64_t count_a,

      					    int64_t start_b, int64_t count_b,

        Jun Wu
    
xdiff: vendor xdiff library from git...

              r36689
            
      					    void *cb_data);

      typedef struct s_xdemitconf {

        Jun Wu
    
xdiff: replace {unsigned ,}long with {u,}int64_t...

              r36840
            
      	uint64_t flags;

        Jun Wu
    
xdiff: vendor xdiff library from git...

              r36689
            
      	xdl_emit_hunk_consume_func_t hunk_func;

      } xdemitconf_t;

      #define xdl_malloc(x) malloc(x)

      #define xdl_free(ptr) free(ptr)

      #define xdl_realloc(ptr,x) realloc(ptr,x)

        Jun Wu
    
xdiff: replace {unsigned ,}long with {u,}int64_t...

              r36840
            
      void *xdl_mmfile_first(mmfile_t *mmf, int64_t *size);

      int64_t xdl_mmfile_size(mmfile_t *mmf);

        Jun Wu
    
xdiff: vendor xdiff library from git...

              r36689
            
      int xdl_diff(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp,

      	     xdemitconf_t const *xecfg, xdemitcb_t *ecb);

      #ifdef __cplusplus

      }

      #endif /* #ifdef __cplusplus */

      #endif /* #if !defined(XDIFF_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

Jun Wu xdiff: vendor xdiff library from git...	r36689	/*
		* LibXDiff by Davide Libenzi ( File Differential Library )
		* Copyright (C) 2003 Davide Libenzi
		*
		* This library is free software; you can redistribute it and/or
		* modify it under the terms of the GNU Lesser General Public
		* License as published by the Free Software Foundation; either
		* version 2.1 of the License, or (at your option) any later version.
		*
		* This library is distributed in the hope that it will be useful,
		* but WITHOUT ANY WARRANTY; without even the implied warranty of
		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
		* Lesser General Public License for more details.
		*
		* You should have received a copy of the GNU Lesser General Public
		* License along with this library; if not, see
		* <http://www.gnu.org/licenses/>.
		*
		* Davide Libenzi <davidel@xmailserver.org>
		*
		*/

		#if !defined(XDIFF_H)
		#define XDIFF_H

		#ifdef __cplusplus
		extern "C" {
		#endif /* #ifdef __cplusplus */

Jun Wu xdiff: remove patience and histogram diff algorithms...	r36690	#include <stddef.h> /* size_t */

Jun Wu xdiff: move stdint.h to xdiff.h...	r36954	#if !defined(_MSC_VER) \|\| _MSC_VER >= 1600
		#include <stdint.h>
		#else
		/* prior to Visual Studio 2010 */
		typedef long long int64_t;
		typedef unsigned long long uint64_t;
		#endif

Jun Wu xdiff: vendor xdiff library from git...	r36689	/* xpparm_t.flags */
		#define XDF_NEED_MINIMAL (1 << 0)

		#define XDF_INDENT_HEURISTIC (1 << 23)

Jun Wu xdiff: add a bdiff hunk mode...	r36691	/* emit bdiff-style "matched" (a1, a2, b1, b2) hunks instead of "different"
		* (a1, a2 - a1, b1, b2 - b1) hunks */
		#define XDL_EMIT_BDIFFHUNK (1 << 4)
Jun Wu xdiff: vendor xdiff library from git...	r36689
		typedef struct s_mmfile {
		char *ptr;
Jun Wu xdiff: replace {unsigned ,}long with {u,}int64_t...	r36840	int64_t size;
Jun Wu xdiff: vendor xdiff library from git...	r36689	} mmfile_t;

		typedef struct s_mmbuffer {
		char *ptr;
Jun Wu xdiff: replace {unsigned ,}long with {u,}int64_t...	r36840	int64_t size;
Jun Wu xdiff: vendor xdiff library from git...	r36689	} mmbuffer_t;

		typedef struct s_xpparam {
Jun Wu xdiff: replace {unsigned ,}long with {u,}int64_t...	r36840	uint64_t flags;
Jun Wu xdiff: vendor xdiff library from git...	r36689	} xpparam_t;

		typedef struct s_xdemitcb {
		void *priv;
		} xdemitcb_t;

Jun Wu xdiff: replace {unsigned ,}long with {u,}int64_t...	r36840	typedef int (*xdl_emit_hunk_consume_func_t)(int64_t start_a, int64_t count_a,
		int64_t start_b, int64_t count_b,
Jun Wu xdiff: vendor xdiff library from git...	r36689	void *cb_data);

		typedef struct s_xdemitconf {
Jun Wu xdiff: replace {unsigned ,}long with {u,}int64_t...	r36840	uint64_t flags;
Jun Wu xdiff: vendor xdiff library from git...	r36689	xdl_emit_hunk_consume_func_t hunk_func;
		} xdemitconf_t;


		#define xdl_malloc(x) malloc(x)
		#define xdl_free(ptr) free(ptr)
		#define xdl_realloc(ptr,x) realloc(ptr,x)

Jun Wu xdiff: replace {unsigned ,}long with {u,}int64_t...	r36840	void xdl_mmfile_first(mmfile_t mmf, int64_t *size);
		int64_t xdl_mmfile_size(mmfile_t *mmf);
Jun Wu xdiff: vendor xdiff library from git...	r36689
		int xdl_diff(mmfile_t mf1, mmfile_t mf2, xpparam_t const *xpp,
		xdemitconf_t const xecfg, xdemitcb_t ecb);

		#ifdef __cplusplus
		}
		#endif /* #ifdef __cplusplus */

		#endif /* #if !defined(XDIFF_H) */