upstream/mercurial-mirror Files · contrib/chg/procutil.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

Jun Wu - - Load All Authors

File last commit:

r31941:ac552702 default


                r45252:45f3f35c

default

Download file

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

        Jun Wu
    
chg: add procutil.h...

              r30693
            
      /*

       * 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);

        Jun Wu
    
chg: respect environment variables for pager...

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

        Jun Wu
    
chg: add procutil.h...

              r30693
            
      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

Jun Wu chg: add procutil.h...	r30693	/*
		* 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);

Jun Wu chg: respect environment variables for pager...	r31941	pid_t setuppager(const char pagercmd, const char envp[]);
Jun Wu chg: add procutil.h...	r30693	void waitpager(void);

		#endif /* PROCUTIL_H_ */