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

copies: add test that makes both the merging csets dirty and fails...

copies: add test that makes both the merging csets dirty and fails This patch is a part of series which is about the case when both the merging csets are not descendant of merge base. The existing code assumes if c1 is dirty there shouldn't be any partial copies from c2 i.e both2['incomplete'] and same for c2, if c2 is dirty both1['incomplete'] should be empty, but this is not the right assumption. Now as we know we can have both c1 and c2 dirty at the same time, it is possible that c1 is dirty and both2['incomplete'] has some value. Or if c2 is dirty and both1['incomplete'] has some value. Added test shows that because of this assumption it could fail. Differential Revision: https://phab.mercurial-scm.org/D5962

Augie Fackler - - Load All Authors

File last commit:

r35977:9724f549 default


                r42097:fc4b7a46

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