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

status: disable morestatus when using -0...

status: disable morestatus when using -0 Without this patch, you get something like this: ``` M a\x00? a.orig\x00# The repository is in an unfinished *merge* state. (esc) # Unresolved merge conflicts: # # a # # To mark files as resolved: hg resolve --mark FILE # To continue: hg commit # To abort: hg merge --abort ``` That doesn't seem like something one would ever want. I considered making it an error to combine `-0` with morestatus, but it seems very likely that that would just make the user spend time trying to figure out how to disable morestatus, so it feels like we might as well just do it for them. Differential Revision: https://phab.mercurial-scm.org/D9545

marmoute - - Load All Authors

File last commit:

r44957:9db11679 default


                r46696:7a2b67e6

default

Download file

             revlog.h
        
                    17 lines
            
             | 392 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)

      #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)

				#endif /* _HG_REVLOG_H_ */