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

filemerge: add support for partial conflict resolution by external tool...

filemerge: add support for partial conflict resolution by external tool A common class of merge conflicts is in imports/#includes/etc. It's relatively easy to write a tool that can resolve these conflicts, perhaps by naively just unioning the statements and leaving any cleanup to other tools to do later [1]. Such specialized tools cannot generally resolve all conflicts in a file, of course. Let's therefore call them "partial merge tools". Note that the internal simplemerge algorithm is such a partial merge tool - one that only resolves trivial "conflicts" where one side is unchanged or both sides change in the same way. One can also imagine having smarter language-aware partial tools that merge the AST. It may be useful for such tools to interactively let the user resolve any conflicts it can't resolve itself. However, having the option of implementing it as a partial merge tool means that the developer doesn't *need* to create a UI for it. Instead, the user can resolve any remaining conflicts with their regular merge tool (e.g. `:merge3` or `meld). We don't currently have a way to let the user define such partial merge tools. That's what this patch addresses. It lets the user configure partial merge tools to run. Each tool can be configured to run only on files matching certain patterns (e.g. "*.py"). The tool takes three inputs (local, base, other) and resolves conflicts by updating these in place. For example, let's say the inputs are these: base: ``` import sys def main(): print('Hello') ``` local: ``` import os import sys def main(): print('Hi') ``` other: ``` import re import sys def main(): print('Howdy') ``` A partial merge tool could now resolve the conflicting imports by replacing the import statements in *all* files by the following snippet, while leaving the remainder of the files unchanged. ``` import os import re import sys ``` As a result, simplemerge and any regular merge tool that runs after the partial merge tool(s) will consider the imports to be non-conflicting and will only present the conflict in `main()` to the user. Differential Revision: https://phab.mercurial-scm.org/D12356

Augie Fackler - - Load All Authors

File last commit:

r35977:9724f549 default


                r49838:f3aafd78

default

Download file

             util.h
        
                    35 lines
            
             | 855 B
            
                | text/x-c
            
             |
                CLexer
            
             / contrib / chg / util.h
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Yuya Nishihara
    
chg: import frontend sources...

              r28060
            
      /*

       * Utility functions

       *

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

      #define UTIL_H_

      #ifdef __GNUC__

      #define PRINTF_FORMAT_ __attribute__((format(printf, 1, 2)))

        Yuya Nishihara
    
chg: silence warning of unused parameter 'sig'

              r29440
            
      #define UNUSED_ __attribute__((unused))

        Jun Wu
    
chg: define PRINTF_FORMAT_ for non gnu C compiler...

              r28604
            
      #else

      #define PRINTF_FORMAT_

        Yuya Nishihara
    
chg: silence warning of unused parameter 'sig'

              r29440
            
      #define UNUSED_

        Yuya Nishihara
    
chg: import frontend sources...

              r28060
            
      #endif

      void abortmsg(const char *fmt, ...) PRINTF_FORMAT_;

        Jun Wu
    
chg: add util function abortmsgerrno to print error with errno...

              r28788
            
      void abortmsgerrno(const char *fmt, ...) PRINTF_FORMAT_;

        Yuya Nishihara
    
chg: import frontend sources...

              r28060
            
        Jun Wu
    
chg: use color in debug/error messages conditionally...

              r28787
            
      void enablecolor(void);

        Yuya Nishihara
    
chg: import frontend sources...

              r28060
            
      void enabledebugmsg(void);

      void debugmsg(const char *fmt, ...) PRINTF_FORMAT_;

        Jun Wu
    
chg: add fchdirx as a utility function...

              r28854
            
      void fchdirx(int dirfd);

        Jun Wu
    
chg: extract the logic of setting FD_CLOEXEC to a utility function...

              r28855
            
      void fsetcloexec(int fd);

        Jun Wu
    
chg: add utility functions mallocx, reallocx...

              r28165
            
      void *mallocx(size_t size);

      void *reallocx(void *ptr, size_t size);

        Yuya Nishihara
    
chg: import frontend sources...

              r28060
            
      int runshellcmd(const char *cmd, const char *envp[], const char *cwd);

        Augie Fackler
    
chg: enable clang-format on all .c and .h files...

              r35977
            
      #endif /* UTIL_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 chg: import frontend sources...	r28060	/*
		* Utility functions
		*
		* 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 UTIL_H_
		#define UTIL_H_

		#ifdef __GNUC__
		#define PRINTF_FORMAT_ __attribute__((format(printf, 1, 2)))
Yuya Nishihara chg: silence warning of unused parameter 'sig'	r29440	#define UNUSED_ __attribute__((unused))
Jun Wu chg: define PRINTF_FORMAT_ for non gnu C compiler...	r28604	#else
		#define PRINTF_FORMAT_
Yuya Nishihara chg: silence warning of unused parameter 'sig'	r29440	#define UNUSED_
Yuya Nishihara chg: import frontend sources...	r28060	#endif

		void abortmsg(const char *fmt, ...) PRINTF_FORMAT_;
Jun Wu chg: add util function abortmsgerrno to print error with errno...	r28788	void abortmsgerrno(const char *fmt, ...) PRINTF_FORMAT_;
Yuya Nishihara chg: import frontend sources...	r28060
Jun Wu chg: use color in debug/error messages conditionally...	r28787	void enablecolor(void);
Yuya Nishihara chg: import frontend sources...	r28060	void enabledebugmsg(void);
		void debugmsg(const char *fmt, ...) PRINTF_FORMAT_;

Jun Wu chg: add fchdirx as a utility function...	r28854	void fchdirx(int dirfd);
Jun Wu chg: extract the logic of setting FD_CLOEXEC to a utility function...	r28855	void fsetcloexec(int fd);
Jun Wu chg: add utility functions mallocx, reallocx...	r28165	void *mallocx(size_t size);
		void reallocx(void ptr, size_t size);

Yuya Nishihara chg: import frontend sources...	r28060	int runshellcmd(const char cmd, const char envp[], const char *cwd);

Augie Fackler chg: enable clang-format on all .c and .h files...	r35977	#endif /* UTIL_H_ */