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

revlog: fix revset in reachableroots docstring...

revlog: fix revset in reachableroots docstring `reachableroots` will only return a subset of `roots` when `includepath` is False. For example, given the following linear DAG: 2 | 1 | 0 Using roots=0+2, heads=1, the definition in the docstring does not match what `reachableroots` actually does: ipdb> repo.changelog.reachableroots(0, roots=[0,2],heads=[1]) [0] ipdb> repo.revs('heads(::(0+2) & (0+2)::1)') <baseset+ [1]> The fix is to do `heads & ::roots` (or `heads & heads::roots`) first, then select their ancestors: ipdb> repo.revs('heads(::((0+2) & (0+2)::1))') <baseset+ [0]> The docstring was introduced by (2015-06-19 "revset: rename revsbetween to reachableroots and add an argument"), which introduced the `includepath=False` behavior for graphlog grandparents use-case. I believe the docstring instead of the code should be changed because changing the code to match the docstring can result in suboptimal graphlog like: o :\ : o : : :/ o As opposite to the current "linearized" graphlog: o | o : o Differential Revision: https://phab.mercurial-scm.org/D7518

Jun Wu - - Load All Authors

File last commit:

r36781:90f8fe72 default


                r44168:1a42f845

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