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

copies: fix the changeset based algorithm regarding merge...

copies: fix the changeset based algorithm regarding merge In 99ebde4fec99, we changed the list of files stored into the `files` field. This lead to the changeset centric copy algorithm to break in various merge situation involving merge. Older information could reach the merge through `p1`, and while information from `p2` was strictly fresher, it would get overwritten anyway. We update the situation with more details about which revision introduces rename information. This help use making the right decision in case of merge. We are now running a more comprehensive suite of test with include this kind of situation. The behavior differ slightly from the filelog based in a couple of instance. There is mostly two distinct cases: 1) there are conflicting rename information in a merge (different rename history on each side). In this case the filelog based implementation arbitrarily pick a side based on the file-revision-number. So it depends on a local factor. The changeset centric algorithm will use a deterministic approach, by picking the information coming from the first parent of the merge. This is stable across different clone. 2) rename information related to file that exist in both source and destination. The filelog based implementation do not even try to detect these, however the changeset centric one get them for "free" (it is simpler to detect them than not). The new implementation focus on correctness. Performance improvement will come later. Differential Revision: https://phab.mercurial-scm.org/D8244

Augie Fackler - - Load All Authors

File last commit:

r35977:9724f549 default


                r45252:45f3f35c

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