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

scmutil: make cleanupnodes optionally also fix the phase...

scmutil: make cleanupnodes optionally also fix the phase We have had multiple bugs where the phase wasn't correctly carried forward to a rewritten changeset (for example: phabricator, split, evolve, fix). Handling the phase update in cleanupnodes() makes it less likely to happen again, especially once we have made it fix the phase by default (perhaps in the next release cycle). This patch also updates all applicable callers so we get some testing of it. Note that rebase and histedit can't be fixed yet because they call cleanupnodes() only at the end and the phase may have been changed by the user when the rebase/histedit was interrupted (due to merge conflicts). I think we should make them write one commit at a time (as it already does), along with associated obsmarkers, bookmark moves, etc. When that's done, we can switch them over to cleanupnodes(). Differential Revision: https://phab.mercurial-scm.org/D3818

Jun Wu - - Load All Authors

File last commit:

r36781:90f8fe72 default


                r38442:32fba6fe

default

Download file

             xutils.h
        
                    39 lines
            
             | 1.3 KiB
            
                | text/x-c
            
             |
                CLexer
            
             / mercurial / thirdparty / xdiff / xutils.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(XUTILS_H)

      #define XUTILS_H

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

              r36840
            
      int64_t xdl_bogosqrt(int64_t n);

      int xdl_cha_init(chastore_t *cha, int64_t isize, int64_t icount);

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

              r36689
            
      void xdl_cha_free(chastore_t *cha);

      void *xdl_cha_alloc(chastore_t *cha);

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

              r36840
            
      int64_t xdl_guess_lines(mmfile_t *mf, int64_t sample);

        Jun Wu
    
xdiff: remove unused flags parameter...

              r36841
            
      int xdl_recmatch(const char *l1, int64_t s1, const char *l2, int64_t s2);

      uint64_t xdl_hash_record(char const **data, char const *top);

        Jun Wu
    
xdiff: use int64 for hash table size...

              r36843
            
      unsigned int xdl_hashbits(int64_t size);

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

              r36689
            
      #endif /* #if !defined(XUTILS_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(XUTILS_H)
		#define XUTILS_H



Jun Wu xdiff: replace {unsigned ,}long with {u,}int64_t...	r36840	int64_t xdl_bogosqrt(int64_t n);
		int xdl_cha_init(chastore_t *cha, int64_t isize, int64_t icount);
Jun Wu xdiff: vendor xdiff library from git...	r36689	void xdl_cha_free(chastore_t *cha);
		void xdl_cha_alloc(chastore_t cha);
Jun Wu xdiff: replace {unsigned ,}long with {u,}int64_t...	r36840	int64_t xdl_guess_lines(mmfile_t *mf, int64_t sample);
Jun Wu xdiff: remove unused flags parameter...	r36841	int xdl_recmatch(const char l1, int64_t s1, const char l2, int64_t s2);
		uint64_t xdl_hash_record(char const *data, char const top);
Jun Wu xdiff: use int64 for hash table size...	r36843	unsigned int xdl_hashbits(int64_t size);
Jun Wu xdiff: vendor xdiff library from git...	r36689


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