upstream/mercurial-mirror Files · mercurial/cffi/mpatchbuild.py

wireprotoserver: move all wire protocol handling logic out of hgweb...

wireprotoserver: move all wire protocol handling logic out of hgweb Previous patches from several days ago worked to isolate processing of HTTP wire protocol requests to wireprotoserver. We still had a little logic in hgweb. If feels like the right time to finish the job. This commit moves WSGI request servicing from hgweb to wireprotoserver. The ugly dict holding the parsed request is no more. I think the new code is cleaner. As part of this, we now process wire protocol requests before the block to obtain the "query" variable. This makes it clear that this wonky "query" variable is not used by the wire protocol. The wonkiest part about this code is the HTTP 404. I'm actually not sure what all is going on here. It looks like the code is trying to prevent URL with path components that specify a command from not working. That part I grok. What I don't grok is why we need to send a 404. I would think it would be OK to no-op and let another handler try to service the request. But if we do this, we get some subrepo test failures. So it looks like something is expecting the HTTP 404 and reacting to it in a specific way. It /might/ be possible to change the behavior here. But it isn't something I'm comfortable doing because I don't understand the problem space. Differential Revision: https://phab.mercurial-scm.org/D2740

Yuya Nishihara - - Load All Authors

File last commit:

r32506:2dcb3d52 default


                r36830:158d4ecc

default

Download file

             mpatchbuild.py
        
                    35 lines
            
             | 1.0 KiB
            
                | text/x-python
            
             |
                PythonLexer
            
             / mercurial / cffi / mpatchbuild.py
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Yuya Nishihara
    
cffi: rename build scripts...

              r32505
            
      from __future__ import absolute_import

      import cffi

      import os

      ffi = cffi.FFI()

      mpatch_c = os.path.join(os.path.join(os.path.dirname(__file__), '..',

                                           'mpatch.c'))

        Yuya Nishihara
    
cffi: put compiled modules into mercurial.cffi package...

              r32506
            
      ffi.set_source("mercurial.cffi._mpatch", open(mpatch_c).read(),

        Yuya Nishihara
    
cffi: rename build scripts...

              r32505
            
                     include_dirs=["mercurial"])

      ffi.cdef("""

      struct mpatch_frag {

             int start, end, len;

             const char *data;

      };

      struct mpatch_flist {

             struct mpatch_frag *base, *head, *tail;

      };

      extern "Python" struct mpatch_flist* cffi_get_next_item(void*, ssize_t);

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

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

      void mpatch_lfree(struct mpatch_flist *a);

      static int mpatch_apply(char *buf, const char *orig, size_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);

      """)

      if __name__ == '__main__':

          ffi.compile()

	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 cffi: rename build scripts...	r32505	from __future__ import absolute_import

		import cffi
		import os

		ffi = cffi.FFI()
		mpatch_c = os.path.join(os.path.join(os.path.dirname(__file__), '..',
		'mpatch.c'))
Yuya Nishihara cffi: put compiled modules into mercurial.cffi package...	r32506	ffi.set_source("mercurial.cffi._mpatch", open(mpatch_c).read(),
Yuya Nishihara cffi: rename build scripts...	r32505	include_dirs=["mercurial"])
		ffi.cdef("""

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

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

		extern "Python" struct mpatch_flist* cffi_get_next_item(void*, ssize_t);

		int mpatch_decode(const char bin, ssize_t len, struct mpatch_flist* res);
		ssize_t mpatch_calcsize(size_t len, struct mpatch_flist *l);
		void mpatch_lfree(struct mpatch_flist *a);
		static int mpatch_apply(char buf, const char orig, size_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);
		""")

		if __name__ == '__main__':
		ffi.compile()