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

merge: when rename was made on both sides, use ancestor as merge base...

merge: when rename was made on both sides, use ancestor as merge base When both sides of a merge have renamed a file to the same place, we would treat that as a "both created" action in merge.py. That means that we'd use an empty diffbase. It seems better to use the copy source as diffbase. That can be done by simply dropping code that prevented us from doing that. I think I did it that way in (copies: calculate mergecopies() based on pathcopies(), 2019-04-11) only to preserve the existing behavior. I also suspect it was just an accident that it behaved that way before that commit. Note that until (merge: start using the per-side copy dicts, 2020-01-23), it was non-deterministic (depending on iteration order of the `allsources` set in `copies._fullcopytracing()`) which source was used in the affected test case in test-rename-merge1.t. We could easily have fixed that by sorting them, but now we can instead detect the case (the TODO added in the previous patch). Differential Revision: https://phab.mercurial-scm.org/D7974

Jun Wu - - Load All Authors

File last commit:

r31941:ac552702 default


                r44714:b4057d00

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