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

rebase: allow aborting if last-message.txt is missing...

rebase: allow aborting if last-message.txt is missing Previously, if .hg/rebasestate existed but .hg/last-message.txt was missing, 'hg rebase --abort' would say there's no rebase in progress but 'hg checkout foo' would say 'abort: rebase in progress'. It turns out loading the collapse message will throw a "no rebase in progress" error if the file doesn't exist, even though .hg/rebasestate obviously indicates a rebase is in progress. The fix is to only throw an exception if we're trying to --continue, and to just eat the issues if we're doing --abort. This issue is exposed by us writing the rebase state earlier in the process. This will be used by later patches to ensure the user can appropriately 'hg rebase --abort' if there's a crash before the first the first commit has finished rebasing. Tests cover all of this. The only negative affect is we now require a hg rebase --abort in a very specific exception case, as shown in the test.

Jun Wu - - Load All Authors

File last commit:

r30741:fde9692a default


                r31225:749b057b

default

Download file

             hgclient.h
        
                    30 lines
            
             | 846 B
            
                | text/x-c
            
             |
                CLexer
            
             / contrib / chg / hgclient.h
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Yuya Nishihara
    
chg: import frontend sources...

              r28060
            
      /*

       * A command server client that uses Unix domain socket

       *

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

      #define HGCLIENT_H_

      #include <sys/types.h>

      struct hgclient_tag_;

      typedef struct hgclient_tag_ hgclient_t;

      hgclient_t *hgc_open(const char *sockname);

      void hgc_close(hgclient_t *hgc);

        Jun Wu
    
chg: add pgid to hgclient struct...

              r29581
            
      pid_t hgc_peerpgid(const hgclient_t *hgc);

        Yuya Nishihara
    
chg: import frontend sources...

              r28060
            
      pid_t hgc_peerpid(const hgclient_t *hgc);

        Jun Wu
    
chg: implement validate in hgclient...

              r28356
            
      const char **hgc_validate(hgclient_t *hgc, const char *const args[],

      			  size_t argsize);

        Yuya Nishihara
    
chg: import frontend sources...

              r28060
            
      int hgc_runcommand(hgclient_t *hgc, const char *const args[], size_t argsize);

      void hgc_attachio(hgclient_t *hgc);

      void hgc_setenv(hgclient_t *hgc, const char *const envp[]);

      #endif  /* HGCLIENT_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	/*
		* A command server client that uses Unix domain socket
		*
		* 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 HGCLIENT_H_
		#define HGCLIENT_H_

		#include <sys/types.h>

		struct hgclient_tag_;
		typedef struct hgclient_tag_ hgclient_t;

		hgclient_t hgc_open(const char sockname);
		void hgc_close(hgclient_t *hgc);

Jun Wu chg: add pgid to hgclient struct...	r29581	pid_t hgc_peerpgid(const hgclient_t *hgc);
Yuya Nishihara chg: import frontend sources...	r28060	pid_t hgc_peerpid(const hgclient_t *hgc);

Jun Wu chg: implement validate in hgclient...	r28356	const char *hgc_validate(hgclient_t hgc, const char *const args[],
		size_t argsize);
Yuya Nishihara chg: import frontend sources...	r28060	int hgc_runcommand(hgclient_t hgc, const char const args[], size_t argsize);
		void hgc_attachio(hgclient_t *hgc);
		void hgc_setenv(hgclient_t hgc, const char const envp[]);

		#endif /* HGCLIENT_H_ */