upstream/mercurial-mirror Files · mercurial/mpatch.h

py3: allow run-tests.py to run on Windows...

py3: allow run-tests.py to run on Windows This is now functional: HGMODULEPOLICY=py py -3 run-tests.py --local test-help.t --pure --view bcompare However, on this machine without a C compiler, it tries to load cext anyway, and blows up. I haven't looked into why, other than to see that it does set the environment variable. When the test exits though, I see it can't find killdaemons.py, get-with-headers.py, etc. I have no idea why these changes are needed, given that it runs on Linux. But os.system() is insisting that it take a str, and subprocess.Popen() blows up without str: Errored test-help.t: Traceback (most recent call last): File "run-tests.py", line 810, in run self.runTest() File "run-tests.py", line 858, in runTest ret, out = self._run(env) File "run-tests.py", line 1268, in _run exitcode, output = self._runcommand(cmd, env) File "run-tests.py", line 1141, in _runcommand env=env) File "C:\Program Files\Python37\lib\subprocess.py", line 756, in __init__ restore_signals, start_new_session) File "C:\Program Files\Python37\lib\subprocess.py", line 1100, in _execute_child args = list2cmdline(args) File "C:\Program Files\Python37\lib\subprocess.py", line 511, in list2cmdline needquote = (" " in arg) or ("\t" in arg) or not arg TypeError: argument of type 'int' is not iterable This is exactly how it crashes when trying to spin up a pager too. I left one instance of os.system() unchanged in _installhg(), because it doesn't get there.

Augie Fackler - - Load All Authors

File last commit:

r34801:76135583 default


                r39683:543a788e

default

Download file

             mpatch.h
        
                    26 lines
            
             | 717 B
            
                | text/x-c
            
             |
                CLexer
            
             / mercurial / mpatch.h
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      #ifndef _HG_MPATCH_H_

      #define _HG_MPATCH_H_

      #define MPATCH_ERR_NO_MEM -3

      #define MPATCH_ERR_CANNOT_BE_DECODED -2

      #define MPATCH_ERR_INVALID_PATCH -1

      struct mpatch_frag {

      	int start, end, len;

      	const char *data;

      };

      struct mpatch_flist {

      	struct mpatch_frag *base, *head, *tail;

      };

      int mpatch_decode(const char *bin, ssize_t len, struct mpatch_flist **res);

      ssize_t mpatch_calcsize(ssize_t len, struct mpatch_flist *l);

      void mpatch_lfree(struct mpatch_flist *a);

      int mpatch_apply(char *buf, const char *orig, ssize_t len,

                       struct mpatch_flist *l);

      struct mpatch_flist *

      mpatch_fold(void *bins, struct mpatch_flist *(*get_next_item)(void *, ssize_t),

                  ssize_t start, ssize_t end);

      #endif

	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

				#ifndef _HG_MPATCH_H_
				#define _HG_MPATCH_H_

				#define MPATCH_ERR_NO_MEM -3
				#define MPATCH_ERR_CANNOT_BE_DECODED -2
				#define MPATCH_ERR_INVALID_PATCH -1

				struct mpatch_frag {
				int start, end, len;
				const char *data;
				};

				struct mpatch_flist {
				struct mpatch_frag base, head, *tail;
				};

				int mpatch_decode(const char bin, ssize_t len, struct mpatch_flist *res);
				ssize_t mpatch_calcsize(ssize_t len, struct mpatch_flist *l);
				void mpatch_lfree(struct mpatch_flist *a);
				int mpatch_apply(char buf, const char orig, ssize_t len,
				struct mpatch_flist *l);
				struct mpatch_flist *
				mpatch_fold(void bins, struct mpatch_flist (get_next_item)(void , ssize_t),
				ssize_t start, ssize_t end);

				#endif