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

amend: stop specifying matcher, get all copies in wctx...

amend: stop specifying matcher, get all copies in wctx When we're recreating the commit that we'll be committing, we don't want to filter our copy information based on just the *new* [versions of the] files we're amending. The test has an example of this case, but for clarity, the situation is: ``` $ hg cp src dst && hg commit <do some work> $ hg amend some_unrelated_file.txt $ hg status --copies A dst A some_unrelated_file.txt ``` What *should* happen is that `dst` should remain marked as a copy of `src`, but this did not previously happen. `matcher` here only includes the files that were specified on the commandline, so it only gets the copy information (if any, in this example there's not) for `some_unrelated_file.txt`. When it goes to apply the memctx to actually create the commit, the file copy information is incomplete and loses the information for the files that shouldn't have been affected at all by the amend. Differential Revision: https://phab.mercurial-scm.org/D12625

Augie Fackler - - Load All Authors

File last commit:

r35977:9724f549 default


                r50074:df68d64b

stable

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