upstream/mercurial-mirror Files · contrib/chg/procutil.h

merge: consider the file merged when using :merge-{local,other}...

merge: consider the file merged when using :merge-{local,other} Returning `None` from `simplemerge()` means that the caller interprets it as "no merge was necessary (because two sides matched)". See and issue2680 for some background. However, `simplemerge()` shouldn't even get called in such scenarios, and returning `None` means that the file is not considered merged, even though the contents actually were. See the affected test cases. Differential Revision: https://phab.mercurial-scm.org/D11999

Jun Wu - - Load All Authors

File last commit:

r31941:ac552702 default


                r49398:60a06b0d

default

Download file

             procutil.h
        
                    21 lines
            
             | 528 B
            
                | text/x-c
            
             |
                CLexer
            
             / contrib / chg / procutil.h
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      /*

       * Utilities about process handling - signal and subprocess (ex. pager)

       *

       * Copyright (c) 2011 Yuya Nishihara <yuya@tcha.org>

       *

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

       * GNU General Public License version 2 or any later version.

       */

      #ifndef PROCUTIL_H_

      #define PROCUTIL_H_

      #include <unistd.h>

      void restoresignalhandler(void);

      void setupsignalhandler(pid_t pid, pid_t pgid);

      pid_t setuppager(const char *pagercmd, const char *envp[]);

      void waitpager(void);

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

				/*
				* Utilities about process handling - signal and subprocess (ex. pager)
				*
				* Copyright (c) 2011 Yuya Nishihara <yuya@tcha.org>
				*
				* This software may be used and distributed according to the terms of the
				* GNU General Public License version 2 or any later version.
				*/

				#ifndef PROCUTIL_H_
				#define PROCUTIL_H_

				#include <unistd.h>

				void restoresignalhandler(void);
				void setupsignalhandler(pid_t pid, pid_t pgid);

				pid_t setuppager(const char pagercmd, const char envp[]);
				void waitpager(void);

				#endif /* PROCUTIL_H_ */