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

phabricator: handle local:commits time being string or int...

phabricator: handle local:commits time being string or int When setting local:commits arcanist has different behaviour depending on whether the repo is git or hg. With hg it sets the time as a number, since it calls PHP's strtotime on the value, but with git it sets it as a string. Normally this wouldn't be an issue since phabread wouldn't be interacting with Phabricator Revisions for git repos, but Mozilla has a secondary workflow for git users that uses the git-cinnabar tool to interact with their hg repos. When a git-cinnabar user uses the moz-phab tool to submit patches for mozilla-central it makes use of Mozilla's fork of arcanist, which works with their local git version of m-c, and thus sets the local:commit time as a string, and then translates the commit hashes. Currently when encountering such DREVS phabread dies with "TypeError: %d format: a number is required, not str". phabsend also used to set it as a string but wouldn't have encountered the issue with its own DREVs since it would read hg:meta first. Differential Revision: https://phab.mercurial-scm.org/D6650

Yuya Nishihara - - Load All Authors

File last commit:

r32506:2dcb3d52 default


                r42837:c17e6a3e

default

Download file

             mpatchbuild.py
        
                    36 lines
            
             | 1.1 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'))

        Augie Fackler
    
cleanup: fix some latent open(path).read() et al calls we previously missed...

              r36966
            
      with open(mpatch_c) as f:

          ffi.set_source("mercurial.cffi._mpatch", f.read(),

                         include_dirs=["mercurial"])

        Yuya Nishihara
    
cffi: rename build scripts...

              r32505
            
      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'))
Augie Fackler cleanup: fix some latent open(path).read() et al calls we previously missed...	r36966	with open(mpatch_c) as f:
		ffi.set_source("mercurial.cffi._mpatch", f.read(),
		include_dirs=["mercurial"])
Yuya Nishihara cffi: rename build scripts...	r32505	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()