upstream/mercurial-mirror Files · mercurial/cext/revlog.h

dirstate: fix restoration of "merged" state after a remove...

dirstate: fix restoration of "merged" state after a remove Before this change, "merged" file that get removed and re-added later were recorded as "from_p2" instead. This came from 8fe74328f700, a 2014 changeset that start explicitly doing so for reason I have not been able to fully grasp. The graft test mentioned in the description are still happy after this changeset. So this changeset restore what seems to be the intended behavior. Restoring information as it was before the removal. Differential Revision: https://phab.mercurial-scm.org/D11429

marmoute - - Load All Authors

File last commit:

r44957:9db11679 default


                r48803:87b3010c

default

Download file

             revlog.h
        
                    17 lines
            
             | 392 B
            
                | text/x-c
            
             |
                CLexer
            
             / mercurial / cext / revlog.h
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Yuya Nishihara
    
revlog: export symbol of indexType...

              r40894
            
      /*

       revlog.h - efficient revlog parsing

       This software may be used and distributed according to the terms of

       the GNU General Public License, incorporated herein by reference.

      */

      #ifndef _HG_REVLOG_H_

      #define _HG_REVLOG_H_

      #include <Python.h>

        Yuya Nishihara
    
revlog: rename indexType to HgRevlogIndex_Type as it's a global symbol...

              r40895
            
      extern PyTypeObject HgRevlogIndex_Type;

        Yuya Nishihara
    
revlog: export symbol of indexType...

              r40894
            
        Yuya Nishihara
    
revlog: add public CPython function to get parent revisions...

              r40896
            
      #define HgRevlogIndex_Check(op) PyObject_TypeCheck(op, &HgRevlogIndex_Type)

        Yuya Nishihara
    
revlog: export symbol of indexType...

              r40894
            
      #endif /* _HG_REVLOG_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

Yuya Nishihara revlog: export symbol of indexType...	r40894	/*
		revlog.h - efficient revlog parsing

		This software may be used and distributed according to the terms of
		the GNU General Public License, incorporated herein by reference.
		*/

		#ifndef _HG_REVLOG_H_
		#define _HG_REVLOG_H_

		#include <Python.h>

Yuya Nishihara revlog: rename indexType to HgRevlogIndex_Type as it's a global symbol...	r40895	extern PyTypeObject HgRevlogIndex_Type;
Yuya Nishihara revlog: export symbol of indexType...	r40894
Yuya Nishihara revlog: add public CPython function to get parent revisions...	r40896	#define HgRevlogIndex_Check(op) PyObject_TypeCheck(op, &HgRevlogIndex_Type)

Yuya Nishihara revlog: export symbol of indexType...	r40894	#endif /* _HG_REVLOG_H_ */