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

rebase: clear updatestate during rebase --abort in more cases...

rebase: clear updatestate during rebase --abort in more cases Previously, rebase --abort would only call update if you were on a node that had already been rebased. This meant that if the rebase failed during the rebase of the first commit, the working copy would be left dirty (with a .hg/updatestate file) and rebase --abort would not have update to clean it up. The fix is to also perform an update if you're still on the target node or on the original working copy node (since the working copy may be dirty, we still need to do the update). We don't want to perform an update in all cases though because of issue4009. A subsequent patch makes this case much more common, since it causes the entire rebase transaction to rollback during unexpected exceptions. This causes the existing test-rebase-abort.t to cover this case.

Yuya Nishihara - - Load All Authors

File last commit:

r29440:009cc6c8 default


                r31222:56d3e0b4

default

Download file

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

        Yuya Nishihara
    
chg: import frontend sources...

              r28060
            
      /*

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

        Yuya Nishihara
    
chg: silence warning of unused parameter 'sig'

              r29440
            
      #define UNUSED_ __attribute__((unused))

        Jun Wu
    
chg: define PRINTF_FORMAT_ for non gnu C compiler...

              r28604
            
      #else

      #define PRINTF_FORMAT_

        Yuya Nishihara
    
chg: silence warning of unused parameter 'sig'

              r29440
            
      #define UNUSED_

        Yuya Nishihara
    
chg: import frontend sources...

              r28060
            
      #endif

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

        Jun Wu
    
chg: add util function abortmsgerrno to print error with errno...

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

        Yuya Nishihara
    
chg: import frontend sources...

              r28060
            
        Jun Wu
    
chg: use color in debug/error messages conditionally...

              r28787
            
      void enablecolor(void);

        Yuya Nishihara
    
chg: import frontend sources...

              r28060
            
      void enabledebugmsg(void);

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

        Jun Wu
    
chg: add fchdirx as a utility function...

              r28854
            
      void fchdirx(int dirfd);

        Jun Wu
    
chg: extract the logic of setting FD_CLOEXEC to a utility function...

              r28855
            
      void fsetcloexec(int fd);

        Jun Wu
    
chg: add utility functions mallocx, reallocx...

              r28165
            
      void *mallocx(size_t size);

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

        Yuya Nishihara
    
chg: import frontend sources...

              r28060
            
      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

Yuya Nishihara chg: import frontend sources...	r28060	/*
		* 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)))
Yuya Nishihara chg: silence warning of unused parameter 'sig'	r29440	#define UNUSED_ __attribute__((unused))
Jun Wu chg: define PRINTF_FORMAT_ for non gnu C compiler...	r28604	#else
		#define PRINTF_FORMAT_
Yuya Nishihara chg: silence warning of unused parameter 'sig'	r29440	#define UNUSED_
Yuya Nishihara chg: import frontend sources...	r28060	#endif

		void abortmsg(const char *fmt, ...) PRINTF_FORMAT_;
Jun Wu chg: add util function abortmsgerrno to print error with errno...	r28788	void abortmsgerrno(const char *fmt, ...) PRINTF_FORMAT_;
Yuya Nishihara chg: import frontend sources...	r28060
Jun Wu chg: use color in debug/error messages conditionally...	r28787	void enablecolor(void);
Yuya Nishihara chg: import frontend sources...	r28060	void enabledebugmsg(void);
		void debugmsg(const char *fmt, ...) PRINTF_FORMAT_;

Jun Wu chg: add fchdirx as a utility function...	r28854	void fchdirx(int dirfd);
Jun Wu chg: extract the logic of setting FD_CLOEXEC to a utility function...	r28855	void fsetcloexec(int fd);
Jun Wu chg: add utility functions mallocx, reallocx...	r28165	void *mallocx(size_t size);
		void reallocx(void ptr, size_t size);

Yuya Nishihara chg: import frontend sources...	r28060	int runshellcmd(const char cmd, const char envp[], const char *cwd);

		#endif /* UTIL_H_ */