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

vfs: simplify the `abstractvfs.rename()` implementation...

vfs: simplify the `abstractvfs.rename()` implementation PyCharm was yapping about `util.rename()` not returning anything, because it is typed to return `None`, but the value was captured and returned after calling `_avoidambig()`. Instead, drop all of that, unconditionally rename, and then call `_avoidambig()` if appropriate. While we're here, convert the ersatz ternary operator into a modern one to help pytype. When a variable is initialized the old way, pytype tends to assign the type of the LHS of the `and`. In this case, that's a bool, and it will get confused that bool doesn't have a `stat` attribute once this method gets more type annotations. (Currently it thinks the `checkambig` arg is `Any`, so it doesn't care.)

Jun Wu - - Load All Authors

File last commit:

r36781:90f8fe72 default


                r52778:adbb183c

default

Download file

             xdiffi.h
        
                    58 lines
            
             | 1.6 KiB
            
                | text/x-c
            
             |
                CLexer
            
             / mercurial / thirdparty / xdiff / xdiffi.h
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      /*

       *  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(XDIFFI_H)

      #define XDIFFI_H

      typedef struct s_diffdata {

      	int64_t nrec;

      	uint64_t const *ha;

      	int64_t *rindex;

      	char *rchg;

      } diffdata_t;

      typedef struct s_xdalgoenv {

      	int64_t mxcost;

      	int64_t snake_cnt;

      	int64_t heur_min;

      } xdalgoenv_t;

      typedef struct s_xdchange {

      	struct s_xdchange *next;

      	int64_t i1, i2;

      	int64_t chg1, chg2;

      	int ignore;

      } xdchange_t;

      int xdl_recs_cmp(diffdata_t *dd1, int64_t off1, int64_t lim1,

      		 diffdata_t *dd2, int64_t off2, int64_t lim2,

      		 int64_t *kvdf, int64_t *kvdb, int need_min, xdalgoenv_t *xenv);

      int xdl_do_diff(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp,

      		xdfenv_t *xe);

      int xdl_change_compact(xdfile_t *xdf, xdfile_t *xdfo, int64_t flags);

      int xdl_build_script(xdfenv_t *xe, xdchange_t **xscr);

      void xdl_free_script(xdchange_t *xscr);

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

				/*
				* 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(XDIFFI_H)
				#define XDIFFI_H


				typedef struct s_diffdata {
				int64_t nrec;
				uint64_t const *ha;
				int64_t *rindex;
				char *rchg;
				} diffdata_t;

				typedef struct s_xdalgoenv {
				int64_t mxcost;
				int64_t snake_cnt;
				int64_t heur_min;
				} xdalgoenv_t;

				typedef struct s_xdchange {
				struct s_xdchange *next;
				int64_t i1, i2;
				int64_t chg1, chg2;
				int ignore;
				} xdchange_t;



				int xdl_recs_cmp(diffdata_t *dd1, int64_t off1, int64_t lim1,
				diffdata_t *dd2, int64_t off2, int64_t lim2,
				int64_t kvdf, int64_t kvdb, int need_min, xdalgoenv_t *xenv);
				int xdl_do_diff(mmfile_t mf1, mmfile_t mf2, xpparam_t const *xpp,
				xdfenv_t *xe);
				int xdl_change_compact(xdfile_t xdf, xdfile_t xdfo, int64_t flags);
				int xdl_build_script(xdfenv_t xe, xdchange_t *xscr);
				void xdl_free_script(xdchange_t *xscr);

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