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

copies: follow copies across merge base without source file (issue6163)...

copies: follow copies across merge base without source file (issue6163) As in the previous patch, consider these two histories: @ 4 'rename x to y' | o 3 'add x again' | o 2 'remove x' | | o 1 'modify x' |/ o 0 'add x' @ 4 'rename x to y' | o 3 'add x again' | | o 2 'modify x' | | | o 1 'add x' |/ o 0 'base' We trace copies from the 'modify x' commit to commit 4 by going via the merge base (commit 0). When tracing file 'y' (_tracefile()) in the first case, we immediately find the rename from 'x'. We check to see if 'x' exists in the merge base, which it does, so we consider it a valid copy. In the second case, 'x' does not exist in the merge base, so it's not considered a valid copy. As a workaround, this patch makes it so we also attempt the check in mergecopies's base commit (commit 1 in the second case). That feels pretty ugly to me, but I don't have any better ideas. Note that we actually also check not only that the filename matches, but also that the file's nodeid matches. I don't know why we do that, but it was like that already before I rewrote mergecopies(). That means that the rebase will still fail in cases like this (again, it already failed before my rewrite): @ 4 'rename x to y' | o 3 'add x again with content X2' | o 2 'remove x' | | o 1 'modify x to content X2' |/ o 1 'modify x to content X1' | o 0 'add x with content X0' Differential Revision: https://phab.mercurial-scm.org/D6604

Augie Fackler - - Load All Authors

File last commit:

r35977:9724f549 default


                r42798:819712de

default

Download file

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

      /*

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

      #define UNUSED_ __attribute__((unused))

      #else

      #define PRINTF_FORMAT_

      #define UNUSED_

      #endif

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

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

      void enablecolor(void);

      void enabledebugmsg(void);

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

      void fchdirx(int dirfd);

      void fsetcloexec(int fd);

      void *mallocx(size_t size);

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

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

      #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

				/*
				* 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)))
				#define UNUSED_ __attribute__((unused))
				#else
				#define PRINTF_FORMAT_
				#define UNUSED_
				#endif

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

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

				void fchdirx(int dirfd);
				void fsetcloexec(int fd);
				void *mallocx(size_t size);
				void reallocx(void ptr, size_t size);

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

				#endif /* UTIL_H_ */