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

merge: disallow merge abort in case of an unfinished operation (issue6160)...

merge: disallow merge abort in case of an unfinished operation (issue6160) This patch disallows `hg merge --abort` in case an operation of higher precedence i.e unshelve, rebase, histedit are in unfinished states. This is done so as to avoid partial abort of these operations in case merge abort is called at an interrupted step. The patch adds a `cmdutil.getunfinishedstate` function which checks for operations under progress and returns a `statecheck` object for it. Differential Revision: https://phab.mercurial-scm.org/D6607

Yuya Nishihara - - Load All Authors

File last commit:

r40896:b12700dd default


                r42780:b8d54f46

default

Download file

             revlog.h
        
                    19 lines
            
             | 455 B
            
                | text/x-c
            
             |
                CLexer
            
             / mercurial / cext / revlog.h
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      /*

       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>

      extern PyTypeObject HgRevlogIndex_Type;

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

      int HgRevlogIndex_GetParents(PyObject *op, int rev, int *ps);

      #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

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

				extern PyTypeObject HgRevlogIndex_Type;

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

				int HgRevlogIndex_GetParents(PyObject op, int rev, int ps);

				#endif /* _HG_REVLOG_H_ */